svn commit: r1731778 - /sling/trunk/testing/mocks/sling-mock-oak/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java

[ss...@apache.org]

Author: sseifert
Date: Tue Feb 23 02:06:41 2016
New Revision: 1731778

URL: http://svn.apache.org/viewvc?rev=1731778&view=rev
Log:
SLING-5547 Update sling-mock-oak to Sling API 2.11 and Oak 1.3.15

Modified:
    sling/trunk/testing/mocks/sling-mock-oak/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java

Modified: sling/trunk/testing/mocks/sling-mock-oak/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-oak/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java?rev=1731778&r1=1731777&r2=1731778&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock-oak/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java (original)
+++ sling/trunk/testing/mocks/sling-mock-oak/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java Tue Feb 23 02:06:41 2016
@@ -18,6 +18,7 @@
  */
 package org.apache.sling.testing.mock.sling.oak;
 
+import java.lang.reflect.Field;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -42,6 +43,8 @@ import org.apache.jackrabbit.oak.jcr.Jcr
 import org.apache.sling.jcr.api.SlingRepository;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.ComponentContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Component
 @Service(SlingRepository.class)
@@ -54,6 +57,8 @@ public final class OakMockSlingRepositor
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
     
+    private static final Logger log = LoggerFactory.getLogger(OakMockSlingRepository.class);
+    
     @Activate
     protected void activate(BundleContext bundleContext) {
         executor = Executors.newSingleThreadExecutor();
@@ -77,12 +82,26 @@ public final class OakMockSlingRepositor
 
     @Deactivate
     protected void deactivate(ComponentContext componentContext) {
-        // shutdown OAK JCR repository
-        ((JackrabbitRepository)repository).shutdown();
-        
         // shutdown executors
+        // force immediate shutdown for all executors without waiting for tasks for completion - we're only in unit tests! 
         executor.shutdownNow();
         scheduledExecutor.shutdownNow();
+        shutdownExecutorService(repository, "scheduledExecutor");
+
+        // shutdown OAK JCR repository
+        ((JackrabbitRepository)repository).shutdown();
+    }
+
+    private void shutdownExecutorService(Object instance, String fieldName) {
+        try {
+            Field executorField = instance.getClass().getDeclaredField(fieldName); 
+            executorField.setAccessible(true);
+            ExecutorService executor = (ExecutorService)executorField.get(instance);
+            executor.shutdownNow();
+        }
+        catch (Throwable ex) {
+            log.error("Potential Memory leak: Unable to shutdown executor service from field '" + fieldName + "' in " + instance, ex);
+        }
     }
     
     public String getDescriptor(String key) {