diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/ExecutorCloser.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/ExecutorCloser.java
index ae219cf..84e7666 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/ExecutorCloser.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/ExecutorCloser.java
@@ -25,15 +25,11 @@ import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Nullable;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Utility class to properly close any ExecutorService. It ensures
  * that executor is properly closed once the call from close is returned
  */
 public final class ExecutorCloser implements Closeable {
-    private final Logger log = LoggerFactory.getLogger(getClass());
     private final ExecutorService executorService;
     private final int timeout;
     private final TimeUnit timeUnit;
@@ -53,17 +49,6 @@ public final class ExecutorCloser implements Closeable {
         if (executorService == null) {
             return;
         }
-        try {
-            executorService.shutdown();
-            executorService.awaitTermination(timeout, timeUnit);
-        } catch (InterruptedException e) {
-            log.error("Error while shutting down the executorService", e);
-            Thread.currentThread().interrupt();
-        } finally {
-            if (!executorService.isTerminated()) {
-                log.warn("ExecutorService didn't shutdown properly. Will be forced now.");
-            }
-            executorService.shutdownNow();
-        }
+        ExecutorUtils.shutdown(executorService, timeUnit, timeout);
     }
 }
\ No newline at end of file
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorProvider.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorProvider.java
index c1460ba..e493cb3 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorProvider.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorProvider.java
@@ -36,6 +36,7 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.ReferencePolicy;
 import org.apache.felix.scr.annotations.Service;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.commons.concurrent.ExecutorUtils;
 import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard;
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
 import org.apache.jackrabbit.oak.spi.commit.Editor;
@@ -188,17 +189,7 @@ public class AtomicCounterEditorProvider implements EditorProvider {
             LOG.debug("No ScheduledExecutorService found");
         } else {
             LOG.debug("Shutting down ScheduledExecutorService");
-            try {
-                ses.shutdown();
-                ses.awaitTermination(5, TimeUnit.SECONDS);
-            } catch (InterruptedException e) {
-                LOG.error("InterruptedException white shutting down ScheduledExecutorService", e);
-            } finally {
-                if (!ses.isTerminated()) {
-                    LOG.debug("ScheduledExecutorService not yet shutdown. Cancelling tasks and forcing quit.");
-                }
-                ses.shutdownNow();
-            }
+            ExecutorUtils.shutdown(ses, TimeUnit.SECONDS, 5);
         }
     }