You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2005/11/10 08:52:59 UTC
svn commit: r332242 -
/geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
Author: ammulder
Date: Wed Nov 9 23:52:56 2005
New Revision: 332242
URL: http://svn.apache.org/viewcvs?rev=332242&view=rev
Log:
Don't barf on double-release
Modified:
geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
Modified: geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java?rev=332242&r1=332241&r2=332242&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java (original)
+++ geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java Wed Nov 9 23:52:56 2005
@@ -63,11 +63,13 @@
}
public void release() {
- try {
- ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager);
- } finally {
- configurationManager = null;
- kernel = null;
+ if(kernel != null && configurationManager != null) {
+ try {
+ ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager);
+ } finally {
+ configurationManager = null;
+ kernel = null;
+ }
}
}