You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/08/12 17:58:42 UTC

svn commit: r1157171 - /geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java

Author: xuhaihong
Date: Fri Aug 12 15:58:42 2011
New Revision: 1157171

URL: http://svn.apache.org/viewvc?rev=1157171&view=rev
Log:
Close the reaper thread while stopping the deployer, which could cause some leak in the building time, and it seems that we never close this thread in the past.

Modified:
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java?rev=1157171&r1=1157170&r2=1157171&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java Fri Aug 12 15:58:42 2011
@@ -497,12 +497,16 @@ public class Deployer implements GBeanLi
     }
 
     public void doFail() {
-        if (reaper != null) {
-            reaper.close();
+        try {
+            doStop();
+        } catch (Exception e) {
         }
     }
 
     public void doStop() throws Exception {
+        if (reaper != null) {
+            reaper.close();
+        }
     }
 
     /**