Author: remm Date: Mon Mar 10 12:58:42 2014 New Revision: 1575929 URL: http://svn.apache.org/r1575929 Log: Fix NIO2 mbean names tested by the registration test, it would otherwise use the NIO1 names.
Modified: tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Modified: tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1575929&r1=1575928&r2=1575929&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java (original) +++ tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Mon Mar 10 12:58:42 2014 @@ -193,7 +193,9 @@ public class TestRegistration extends To // Create the list of expected MBean names String protocol = tomcat.getConnector().getProtocolHandlerClassName(); - if (protocol.indexOf("Nio") > 0) { + if (protocol.indexOf("Nio2") > 0) { + protocol = "nio2"; + } else if (protocol.indexOf("Nio") > 0) { protocol = "nio"; } else if (protocol.indexOf("Apr") > 0) { protocol = "apr"; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org