commit b0317c6a3f894746d15f6b029241ef9e9a84959e
author Thomas Vachuska <tom@onlab.us> Wed Apr 08 23:58:58 2015 -0700
committer Ray Milkey <ray@onlab.us> Thu Apr 09 18:11:17 2015 +0000
tree a3e618a6f355c23fe79f3c68c3040829d73363e4
parent 429477825cf009fe8508743658846f025d005f46

Fixed javadoc warning; added shared executor/timer wrappers to prevent inadvertent shutdown; added shutdown to CoreManager.deactivate.

Change-Id: I27f31b5d41050d6d87cd6419ab863201c4585843

core/net/src/main/java/org/onosproject/core/impl/CoreManager.java

diff --git a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
index d860b9c..375de99 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
@@ -64,9 +64,9 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected ComponentConfigService cfgService;
 
-    @Property(name = "sharedThreadPoolSize", intValue = SharedExecutors.DEFAULT_THREAD_SIZE,
+    @Property(name = "sharedThreadPoolSize", intValue = SharedExecutors.DEFAULT_POOL_SIZE,
             label = "Configure shared pool maximum size ")
-    private int sharedThreadPoolSize = SharedExecutors.DEFAULT_THREAD_SIZE;
+    private int sharedThreadPoolSize = SharedExecutors.DEFAULT_POOL_SIZE;
 
     @Activate
     public void activate() {
@@ -80,6 +80,7 @@
     @Deactivate
     public void deactivate() {
         cfgService.unregisterProperties(getClass(), false);
+        SharedExecutors.shutdown();
     }
 
     @Override