Adding dependency between driver topology handlers and impl common handler to resolve...

[unimgr.git] / impl / src / main / java / org / opendaylight / unimgr / mef / nrp / impl / connectivityservice / TapiConnectivityServiceImpl.java

diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceImpl.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceImpl.java
index 186a474343a2062ffdcd2547ad8fe842ac72189e..c2e2416aebe20b2048881f6c60e6d55ff921a740 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceImpl.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceImpl.java
@@ -51,9 +51,7 @@ public class TapiConnectivityServiceImpl implements TapiConnectivityService, Aut
     private DataBroker broker;
     private ConnectivityServiceIdResourcePool serviceIdPool;
 
-    private ExecutorService executor = new ThreadPoolExecutor(4, 16,
-            30, TimeUnit.MINUTES,
-            new LinkedBlockingQueue<>());
+    private ExecutorService executor = null;
 
     final static InstanceIdentifier<Context1> connectivityCtx = NrpDao.ctx().augmentation(Context1.class);
 
@@ -64,9 +62,19 @@ public class TapiConnectivityServiceImpl implements TapiConnectivityService, Aut
         Objects.requireNonNull(validator);
         Objects.requireNonNull(broker);
         Objects.requireNonNull(serviceIdPool);
+        if(executor == null) {
+            executor = new ThreadPoolExecutor(4, 16,
+                    30, TimeUnit.MINUTES,
+                    new LinkedBlockingQueue<>());
+        }
         LOG.info("TapiConnectivityService initialized");
     }
 
+    @Override
+    public void close() throws Exception {
+        executor.shutdown();
+    }
+
     @Override
     public Future<RpcResult<CreateConnectivityServiceOutput>> createConnectivityService(CreateConnectivityServiceInput input) {
         return executor.submit(new CreateConnectivityAction(this, input));
@@ -99,11 +107,6 @@ public class TapiConnectivityServiceImpl implements TapiConnectivityService, Aut
         return executor.submit(new ListConnectivityAction(this));
     }
 
-    @Override
-    public void close() throws Exception {
-        executor.shutdown();
-    }
-
 
     public void setValidator(RequestValidator validator) {
         this.validator = validator;
@@ -122,6 +125,7 @@ public class TapiConnectivityServiceImpl implements TapiConnectivityService, Aut
     }
 
     public void setExecutor(ExecutorService executor) {
+        if(executor != null) throw new IllegalStateException();
         this.executor = executor;
     }