Author: markt
Date: Fri Feb 5 14:23:43 2016
New Revision: 1728672
URL: http://svn.apache.org/viewvc?rev=1728672&view=rev
Log:
Prevent NPEs on some error conditions.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1728672&r1=1728671&r2=1728672&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Fri Feb 5
14:23:43 2016
@@ -418,11 +418,11 @@ public class Registry implements Registr
*/
public void unregisterComponent( ObjectName oname ) {
try {
- if( getMBeanServer().isRegistered(oname)) {
+ if (oname != null && getMBeanServer().isRegistered(oname)) {
getMBeanServer().unregisterMBean(oname);
}
- } catch( Throwable t ) {
- log.error( "Error unregistering mbean ", t);
+ } catch (Throwable t) {
+ log.error("Error unregistering mbean", t);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
