Author: markt
Date: Wed Jun 6 19:13:50 2018
New Revision: 1833071
URL: http://svn.apache.org/viewvc?rev=1833071&view=rev
Log:
Fix possible NPE
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=1833071&r1=1833070&r2=1833071&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Wed Jun 6
19:13:50 2018
@@ -686,7 +686,10 @@ public class MBeanFactory {
ObjectName oname = new ObjectName(name);
Service service = getService(oname);
String port = oname.getKeyProperty("port");
- String address = ObjectName.unquote(oname.getKeyProperty("address"));
+ String address = oname.getKeyProperty("address");
+ if (address != null) {
+ address = ObjectName.unquote(address);
+ }
Connector conns[] = service.findConnectors();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
