You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/08/28 18:42:47 UTC
svn commit: r689884 - in
/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local:
RedeployCommand.java StartCommand.java StopCommand.java UndeployCommand.java
Author: gawor
Date: Thu Aug 28 09:42:47 2008
New Revision: 689884
URL: http://svn.apache.org/viewvc?rev=689884&view=rev
Log:
make sure to call doFail() on any exception otherwise things might hang
Modified:
geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java
geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java
geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java?rev=689884&r1=689883&r2=689884&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java Thu Aug 28 09:42:47 2008
@@ -111,7 +111,7 @@
}
addWebURLs(kernel);
complete("Completed");
- } catch (Exception e) {
+ } catch (Throwable e) {
doFail(e);
} finally {
if (spool) {
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java?rev=689884&r1=689883&r2=689884&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java Thu Aug 28 09:42:47 2008
@@ -115,8 +115,7 @@
}
addWebURLs(kernel);
complete("Completed");
- } catch (Exception e) {
- e.printStackTrace();
+ } catch (Throwable e) {
doFail(e);
}
}
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java?rev=689884&r1=689883&r2=689884&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java Thu Aug 28 09:42:47 2008
@@ -100,7 +100,7 @@
} else {
complete("Completed");
}
- } catch (Exception e) {
+ } catch (Throwable e) {
doFail(e);
}
}
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java?rev=689884&r1=689883&r2=689884&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java Thu Aug 28 09:42:47 2008
@@ -86,7 +86,7 @@
updateStatus("Some of the modules to undeploy were not previously deployed. This is not treated as an error.");
}
complete("Completed");
- } catch (Exception e) {
+ } catch (Throwable e) {
doFail(e);
}
}