svn commit: r1561721 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java

[mduerig]

Author: mduerig
Date: Mon Jan 27 16:18:19 2014
New Revision: 1561721

URL: http://svn.apache.org/r1561721
Log:
OAK-1358: Oak should only create one default executor

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java?rev=1561721&r1=1561720&r2=1561721&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java 
(original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java 
Mon Jan 27 16:18:19 2014
@@ -118,7 +118,7 @@ public class Oak {
 
     private ScheduledExecutorService scheduledExecutor = 
defaultScheduledExecutor();
 
-    private Executor executor;
+    private Executor executor = defaultExecutorService();
 
     /**
      * Default {@code ScheduledExecutorService} used for scheduling background 
tasks.
@@ -219,9 +219,6 @@ public class Oak {
                     }
                 }
             } else if (type == Observer.class && store instanceof Observable) {
-                Executor executor = Oak.this.executor == null
-                        ? defaultExecutorService()
-                        : Oak.this.executor;
                 BackgroundObserver backgroundObserver =
                         new BackgroundObserver((Observer) service, executor);
                 observerSubscription.register(backgroundObserver);