Changed finalize() method in ManagerImpl to cleanup() called by boots…

…trap code. git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1761 1c488680-804c-0410-94cd-c6b725194a0e
weld · Mar 4, 2009 · b5c5937 · b5c5937
1 parent c9e4e6e
commit b5c5937
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
@@ -944,8 +944,19 @@ public ExecutorService getTaskExecutor()
       return taskExecutor;
    }
 
-   @Override
-   protected void finalize() throws Throwable
+   /**
+    * Cleans up resources held by the manager prior to shutting down
+    * a VM.
+    */
+   public void cleanup()
+   {
+      shutdownExecutors();
+   }
+
+   /**
+    * Shuts down any executor services in the manager.
+    */
+   protected void shutdownExecutors()
    {
       taskExecutor.shutdown();
       try {
@@ -963,7 +974,7 @@ protected void finalize() throws Throwable
           taskExecutor.shutdownNow();
          // Preserve interrupt status
          Thread.currentThread().interrupt();
-       }
+       }      
    }
 
 }
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
@@ -217,6 +217,7 @@ protected void endApplication(BeanStore applicationBeanStore)
    public void shutdown()
    {
       endApplication(getApplicationContext());
+      manager.cleanup();
    }
 
 }