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 2009/08/27 12:09:54 UTC
svn commit: r808348 -
/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java
Author: xuhaihong
Date: Thu Aug 27 10:09:54 2009
New Revision: 808348
URL: http://svn.apache.org/viewvc?rev=808348&view=rev
Log:
GERONIMO-4816 Handle the scenario of deleting an invalid server
Modified:
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java?rev=808348&r1=808347&r2=808348&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java Thu Aug 27 10:09:54 2009
@@ -687,13 +687,16 @@
return;
}
// check whether the snapshot query is enabled, if does, close it first
- MRCConnector mrc = new MRCConnector(node);
- if (mrc.isSnapshotRunning() == 1) {
- if (mrc.stopSnapshotThread()) {
- addInfoMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.infoMsg06", server_id));
- } else {
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.errorMsg09", server_id));
+ try {
+ MRCConnector mrc = new MRCConnector(node);
+ if (mrc.isSnapshotRunning() == 1) {
+ if (mrc.stopSnapshotThread()) {
+ addInfoMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.infoMsg06", server_id));
+ } else {
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.errorMsg09", server_id));
+ }
}
+ } catch (Exception e) {
}
entityManager.remove(node);
} finally {