Author: markt Date: Tue Nov 3 09:10:59 2015 New Revision: 1712225 URL: http://svn.apache.org/viewvc?rev=1712225&view=rev Log: String.indexOf(String) -> String.indexOf(char) where possible More general fix for an issue identified in https://bz.apache.org/bugzilla/show_bug.cgi?id=58541
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java tomcat/trunk/java/org/apache/tomcat/util/net/URL.java tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java (original) +++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java Tue Nov 3 09:10:59 2015 @@ -162,8 +162,8 @@ public class JMXAccessorQueryTask extend if (!attrs[i].isReadable()) continue; String attName = attrs[i].getName(); - if (attName.indexOf("=") >= 0 || attName.indexOf(":") >= 0 - || attName.indexOf(" ") >= 0) { + if (attName.indexOf('=') >= 0 || attName.indexOf(':') >= 0 + || attName.indexOf(' ') >= 0) { continue; } Modified: tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java Tue Nov 3 09:10:59 2015 @@ -519,7 +519,7 @@ public class DigestAuthenticator extends } // Validate nonce - int i = nonce.indexOf(":"); + int i = nonce.indexOf(':'); if (i < 0 || (i + 1) == nonce.length()) { return false; } Modified: tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Tue Nov 3 09:10:59 2015 @@ -284,7 +284,7 @@ public class JvmRouteBinderValve extends Request request, String sessionId, String localJvmRoute) { // get requested jvmRoute. String requestJvmRoute = null; - int index = sessionId.indexOf("."); + int index = sessionId.indexOf('.'); if (index > 0) { requestJvmRoute = sessionId .substring(index + 1, sessionId.length()); Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Tue Nov 3 09:10:59 2015 @@ -1701,7 +1701,7 @@ public abstract class WebappClassLoaderB Field field = fields[i]; int mods = field.getModifiers(); if (field.getType().isPrimitive() - || (field.getName().indexOf("$") != -1)) { + || (field.getName().indexOf('$') != -1)) { continue; } if (Modifier.isStatic(mods)) { @@ -1749,7 +1749,7 @@ public abstract class WebappClassLoaderB Field field = fields[i]; int mods = field.getModifiers(); if (field.getType().isPrimitive() - || (field.getName().indexOf("$") != -1)) { + || (field.getName().indexOf('$') != -1)) { continue; } try { Modified: tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java Tue Nov 3 09:10:59 2015 @@ -614,7 +614,7 @@ public class StatusTransformer { if (webModuleName.startsWith("//")) { webModuleName = webModuleName.substring(2); } - int slash = webModuleName.indexOf("/"); + int slash = webModuleName.indexOf('/'); if (slash == -1) { count++; continue; @@ -667,7 +667,7 @@ public class StatusTransformer { if (name.startsWith("//")) { name = name.substring(2); } - int slash = name.indexOf("/"); + int slash = name.indexOf('/'); if (slash != -1) { hostName = name.substring(0, slash); contextName = name.substring(slash); Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java Tue Nov 3 09:10:59 2015 @@ -72,9 +72,9 @@ public class MBeanDumper { if (! attrs[i].isReadable()) continue; String attName=attrs[i].getName(); if ("modelerType".equals(attName)) continue; - if (attName.indexOf("=") >=0 || - attName.indexOf(":") >=0 || - attName.indexOf(" ") >=0 ) { + if (attName.indexOf('=') >=0 || + attName.indexOf(':') >=0 || + attName.indexOf(' ') >=0 ) { continue; } 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=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Tue Nov 3 09:10:59 2015 @@ -110,7 +110,7 @@ public class MBeanFactory { if ((j2eeType!=null) && (j2eeType.equals("WebModule"))) { String name = pname.getKeyProperty("name"); name = name.substring(2); - int i = name.indexOf("/"); + int i = name.indexOf('/'); String hostName = name.substring(0,i); String path = name.substring(i); Container host = engine.findChild(hostName); @@ -743,7 +743,7 @@ public class MBeanFactory { Engine engine = (Engine) service.getContainer(); String name = oname.getKeyProperty("name"); name = name.substring(2); - int i = name.indexOf("/"); + int i = name.indexOf('/'); String hostName = name.substring(0,i); String path = name.substring(i); ObjectName deployer = new ObjectName(domain+":type=Deployer,host="+ Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Nov 3 09:10:59 2015 @@ -2599,12 +2599,12 @@ public class JNDIRealm extends RealmBase // strings: (|(something)(somethingelse)) while ( (userPatternString.charAt(startParenLoc + 1) == '|') || (startParenLoc != 0 && userPatternString.charAt(startParenLoc - 1) == '\\') ) { - startParenLoc = userPatternString.indexOf("(", startParenLoc+1); + startParenLoc = userPatternString.indexOf('(', startParenLoc+1); } - endParenLoc = userPatternString.indexOf(")", startParenLoc+1); + endParenLoc = userPatternString.indexOf(')', startParenLoc+1); // weed out escaped end-parens while (userPatternString.charAt(endParenLoc - 1) == '\\') { - endParenLoc = userPatternString.indexOf(")", endParenLoc+1); + endParenLoc = userPatternString.indexOf(')', endParenLoc+1); } String nextPathPart = userPatternString.substring (startParenLoc+1, endParenLoc); Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Tue Nov 3 09:10:59 2015 @@ -788,7 +788,7 @@ public final class CGIServlet extends Ht } else { qs = req.getQueryString(); } - if (qs != null && qs.indexOf("=") == -1) { + if (qs != null && qs.indexOf('=') == -1) { StringTokenizer qsTokens = new StringTokenizer(qs, "+"); while ( qsTokens.hasMoreTokens() ) { cmdLineParameters.add(URLDecoder.decode(qsTokens.nextToken(), @@ -1683,11 +1683,11 @@ public final class CGIServlet extends Ht } if (line.startsWith("HTTP")) { skipBody = setStatus(response, getSCFromHttpStatusLine(line)); - } else if (line.indexOf(":") >= 0) { + } else if (line.indexOf(':') >= 0) { String header = - line.substring(0, line.indexOf(":")).trim(); + line.substring(0, line.indexOf(':')).trim(); String value = - line.substring(line.indexOf(":") + 1).trim(); + line.substring(line.indexOf(':') + 1).trim(); if (header.equalsIgnoreCase("status")) { skipBody = setStatus(response, getSCFromCGIStatusHeader(value)); } else { Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Tue Nov 3 09:10:59 2015 @@ -875,7 +875,7 @@ public class WebdavServlet if (lockDurationStr == null) { lockDuration = DEFAULT_TIMEOUT; } else { - int commaPos = lockDurationStr.indexOf(","); + int commaPos = lockDurationStr.indexOf(','); // If multiple timeouts, just use the first if (commaPos != -1) { lockDurationStr = lockDurationStr.substring(0,commaPos); @@ -1491,7 +1491,7 @@ public class WebdavServlet // if the Destination URL contains the protocol, we can safely // trim everything upto the first "/" character after "://" int firstSeparator = - destinationPath.indexOf("/", protocolIndex + 4); + destinationPath.indexOf('/', protocolIndex + 4); if (firstSeparator < 0) { destinationPath = "/"; } else { @@ -1503,13 +1503,13 @@ public class WebdavServlet destinationPath = destinationPath.substring(hostName.length()); } - int portIndex = destinationPath.indexOf(":"); + int portIndex = destinationPath.indexOf(':'); if (portIndex >= 0) { destinationPath = destinationPath.substring(portIndex); } if (destinationPath.startsWith(":")) { - int firstSeparator = destinationPath.indexOf("/"); + int firstSeparator = destinationPath.indexOf('/'); if (firstSeparator < 0) { destinationPath = "/"; } else { Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original) +++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Tue Nov 3 09:10:59 2015 @@ -253,7 +253,7 @@ public class JspServlet extends HttpServ return false; // part of some other name or value } int limit = queryString.length(); - int ampersand = queryString.indexOf("&"); + int ampersand = queryString.indexOf('&'); if (ampersand > 0) { limit = ampersand; } Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java (original) +++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java Tue Nov 3 09:10:59 2015 @@ -99,7 +99,7 @@ public class Util { return false; } - int colonPos = url.indexOf(":"); + int colonPos = url.indexOf(':'); if(colonPos == -1){ return false; } @@ -154,10 +154,10 @@ public class Util { public static String stripSession(String url) { StringBuilder u = new StringBuilder(url); int sessionStart; - while ((sessionStart = u.toString().indexOf(";" + Constants.SESSION_PARAMETER_NAME + "=")) != -1) { - int sessionEnd = u.toString().indexOf(";", sessionStart + 1); + while ((sessionStart = u.toString().indexOf(';' + Constants.SESSION_PARAMETER_NAME + "=")) != -1) { + int sessionEnd = u.toString().indexOf(';', sessionStart + 1); if (sessionEnd == -1) - sessionEnd = u.toString().indexOf("?", sessionStart + 1); + sessionEnd = u.toString().indexOf('?', sessionStart + 1); if (sessionEnd == -1) // still sessionEnd = u.length(); u.delete(sessionStart, sessionEnd); Modified: tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java (original) +++ tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java Tue Nov 3 09:10:59 2015 @@ -56,7 +56,7 @@ public class JdkLoggerFormatter extends String message=formatMessage(record); - if( name.indexOf(".") >= 0 ) + if( name.indexOf('.') >= 0 ) name = name.substring(name.lastIndexOf(".") + 1); // Use a string buffer for better performance Modified: tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Tue Nov 3 09:10:59 2015 @@ -228,14 +228,14 @@ public final class IntrospectionUtils { */ public static String replaceProperties(String value, Hashtable<Object,Object> staticProp, PropertySource dynamicProp[]) { - if (value.indexOf("$") < 0) { + if (value.indexOf('$') < 0) { return value; } StringBuilder sb = new StringBuilder(); int prev = 0; // assert value!=nil int pos; - while ((pos = value.indexOf("$", prev)) >= 0) { + while ((pos = value.indexOf('$', prev)) >= 0) { if (pos > 0) { sb.append(value.substring(prev, pos)); } Modified: tomcat/trunk/java/org/apache/tomcat/util/net/URL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/URL.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/URL.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/URL.java Tue Nov 3 09:10:59 2015 @@ -571,7 +571,7 @@ public final class URL implements Serial // Parse the authority section if (spec.indexOf("//", start) == start) { - int pathStart = spec.indexOf("/", start + 2); + int pathStart = spec.indexOf('/', start + 2); if ((pathStart >= 0) && (pathStart < limit)) { authority = spec.substring(start + 2, pathStart); start = pathStart; @@ -614,7 +614,7 @@ public final class URL implements Serial } // Parse the path section - if (spec.indexOf("/", start) == start) { // Absolute path + if (spec.indexOf('/', start) == start) { // Absolute path path = spec.substring(start, limit); if (query != null) file = path + "?" + query; Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java Tue Nov 3 09:10:59 2015 @@ -296,7 +296,7 @@ public class OpenSSLContext implements o // List the ciphers that the client is permitted to negotiate String ciphers = sslHostConfig.getCiphers(); - if (!("ALL".equals(ciphers)) && ciphers.indexOf(":") == -1) { + if (!("ALL".equals(ciphers)) && ciphers.indexOf(':') == -1) { StringTokenizer tok = new StringTokenizer(ciphers, ","); this.ciphers = new ArrayList<>(); while (tok.hasMoreTokens()) { Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java (original) +++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java Tue Nov 3 09:10:59 2015 @@ -474,8 +474,8 @@ public class PoolProperties implements P //always add the trap interceptor to the mix definitions[0] = new InterceptorDefinition(TrapException.class); for (int i=0; i<interceptorValues.length; i++) { - int propIndex = interceptorValues[i].indexOf("("); - int endIndex = interceptorValues[i].indexOf(")"); + int propIndex = interceptorValues[i].indexOf('('); + int endIndex = interceptorValues[i].indexOf(')'); if (propIndex<0 || endIndex<0 || endIndex <= propIndex) { definitions[i+1] = new InterceptorDefinition(interceptorValues[i].trim()); } else { @@ -484,7 +484,7 @@ public class PoolProperties implements P String propsAsString = interceptorValues[i].substring(propIndex+1, endIndex); String[] props = propsAsString.split(","); for (int j=0; j<props.length; j++) { - int pidx = props[j].indexOf("="); + int pidx = props[j].indexOf('='); String propName = props[j].substring(0,pidx).trim(); String propValue = props[j].substring(pidx+1).trim(); definitions[i+1].addProperty(new InterceptorProperty(propName,propValue)); @@ -957,7 +957,7 @@ public class PoolProperties implements P @SuppressWarnings("unchecked") public Class<? extends JdbcInterceptor> getInterceptorClass() throws ClassNotFoundException { if (clazz==null) { - if (getClassName().indexOf(".")<0) { + if (getClassName().indexOf('.')<0) { if (log.isDebugEnabled()) { log.debug("Loading interceptor class:"+PoolConfiguration.PKG_PREFIX+getClassName()); } Modified: tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java (original) +++ tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java Tue Nov 3 09:10:59 2015 @@ -302,7 +302,7 @@ public class TestDigestAuthenticator ext String authHeader = authHeaders.iterator().next(); int start = authHeader.indexOf("nonce=\"") + 7; - int end = authHeader.indexOf("\"", start); + int end = authHeader.indexOf('\'', start); return authHeader.substring(start, end); } @@ -313,7 +313,7 @@ public class TestDigestAuthenticator ext String authHeader = authHeaders.iterator().next(); int start = authHeader.indexOf("opaque=\"") + 8; - int end = authHeader.indexOf("\"", start); + int end = authHeader.indexOf('\'', start); return authHeader.substring(start, end); } Modified: tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java (original) +++ tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java Tue Nov 3 09:10:59 2015 @@ -315,7 +315,7 @@ public class TestJaspicDigestAuthenticat String authHeader = authHeaders.iterator().next(); int start = authHeader.indexOf("nonce=\"") + 7; - int end = authHeader.indexOf("\"", start); + int end = authHeader.indexOf('\'', start); return authHeader.substring(start, end); } @@ -326,7 +326,7 @@ public class TestJaspicDigestAuthenticat String authHeader = authHeaders.iterator().next(); int start = authHeader.indexOf("opaque=\"") + 8; - int end = authHeader.indexOf("\"", start); + int end = authHeader.indexOf('\'', start); return authHeader.substring(start, end); } Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java?rev=1712225&r1=1712224&r2=1712225&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java Tue Nov 3 09:10:59 2015 @@ -130,7 +130,7 @@ public class ChannelCreator { System.out.println("Setting MessageDispatchInterceptor.maxQueueSize="+asyncsize); } else if ("-static".equals(args[i])) { String d = args[++i]; - String h = d.substring(0,d.indexOf(":")); + String h = d.substring(0,d.indexOf(':')); String p = d.substring(h.length()+1); Member m = new MemberImpl(h,Integer.parseInt(p),2000); staticMembers.add(m); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org