Author: kkolinko Date: Fri Mar 23 16:41:38 2012 New Revision: 1304471 URL: http://svn.apache.org/viewvc?rev=1304471&view=rev Log: Merged revision 1304468 from tomcat/trunk: https://issues.apache.org/bugzilla/show_bug.cgi?id=52830#c6 Alternative implementation of the fix, which does not require that name were an instance of CompositeName.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1304468 Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java?rev=1304471&r1=1304470&r2=1304471&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java Fri Mar 23 16:41:38 2012 @@ -21,7 +21,6 @@ package org.apache.naming; import java.util.Hashtable; import javax.naming.Binding; -import javax.naming.CompositeName; import javax.naming.Context; import javax.naming.Name; import javax.naming.NameClassPair; @@ -772,9 +771,8 @@ public class SelectorContext implements if (name.get(0).equals(prefix)) { return name.getSuffix(1); } else { - Name result = new CompositeName(); - result.add(name.get(0).substring(prefixLength)); - result.addAll(name.getSuffix(1)); + Name result = name.getSuffix(1); + result.add(0, name.get(0).substring(prefixLength)); return result; } } else { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org