svn commit: r1790840 - in /tomcat/trunk/java/org/apache/catalina/tribes: group/GroupChannel.java jmx/JmxRegistry.java membership/McastService.java

[remm]

Author: remm
Date: Mon Apr 10 14:44:02 2017
New Revision: 1790840

URL: http://svn.apache.org/viewvc?rev=1790840&view=rev
Log:
WS and fix NPE in testsuite.

Modified:
    tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
    tomcat/trunk/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
    tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1790840&r1=1790839&r2=1790840&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Mon 
Apr 10 14:44:02 2017
@@ -133,7 +133,7 @@ public class GroupChannel extends Channe
     private boolean jmxEnabled = true;
 
     /**
-     * the ObjectName of this channel. 
+     * the ObjectName of this channel.
      */
     private ObjectName oname = null;
 

Modified: tomcat/trunk/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/jmx/JmxRegistry.java?rev=1790840&r1=1790839&r2=1790840&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/jmx/JmxRegistry.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/jmx/JmxRegistry.java Mon Apr 
10 14:44:02 2017
@@ -45,6 +45,9 @@ public class JmxRegistry {
     }
 
     public static JmxRegistry getRegistry(Channel channel) {
+        if (channel == null || channel.getName() == null) {
+            return null;
+        }
         JmxRegistry registry = registryCache.get(channel.getName());
         if (registry != null) return registry;
 
@@ -88,7 +91,7 @@ public class JmxRegistry {
         }
         return on;
     }
-    
+
     public ObjectName registerJmx(String keyprop, Object bean) {
         String oNameStr = baseOname.toString() + keyprop;
         ObjectName oName = null;

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1790840&r1=1790839&r2=1790840&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java 
Mon Apr 10 14:44:02 2017
@@ -85,7 +85,7 @@ public class McastService
     private Channel channel;
 
     /**
-     * the ObjectName of this McastService. 
+     * the ObjectName of this McastService.
      */
     private ObjectName oname = null;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org