commit 73355f9f2dd74bd66cdcc7bd6e19ad565ba6ae35
author Haihong Xu <xuhaihong@apache.org> Fri Aug 12 15:58:42 2011 +0000
committer Haihong Xu <xuhaihong@apache.org> Fri Aug 12 15:58:42 2011 +0000
tree 0046051511fe30956e7ec62c3c25d71bcda39f24
parent d87281450c3b27b4bcb04d5045b657faeeeacd6c

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.

git-svn-id: https://svn.apache.org/repos/asf/geronimo/server/trunk@1157171 13f79535-47bb-0310-9956-ffa450edef68

framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java

diff --git a/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java b/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
index fbdc938..60779bf 100644
--- a/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
+++ b/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
@@ -497,12 +497,16 @@
     }
 
     public void doFail() {
-        if (reaper != null) {
-            reaper.close();
+        try {
+            doStop();
+        } catch (Exception e) {
         }
     }
 
     public void doStop() throws Exception {
+        if (reaper != null) {
+            reaper.close();
+        }
     }
 
     /**