Author: markt Date: Wed Jan 23 14:06:06 2019 New Revision: 1851921 URL: http://svn.apache.org/viewvc?rev=1851921&view=rev Log: Refactor to simplify the fix for BZ 63026
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java 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=1851921&r1=1851920&r2=1851921&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Wed Jan 23 14:06:06 2019 @@ -2718,6 +2718,7 @@ public class JNDIRealm extends RealmBase // we need to composite a name with the base name, the context name, and // the result name. For non-relative names, use the returned name. String resultName = result.getName(); + Name name; if (result.isRelative()) { if (containerLog.isTraceEnabled()) { containerLog.trace(" search returned relative name: " + resultName); @@ -2729,9 +2730,8 @@ public class JNDIRealm extends RealmBase // Bugzilla 32269 Name entryName = parser.parse(new CompositeName(resultName).get(0)); - Name name = contextName.addAll(baseName); + name = contextName.addAll(baseName); name = name.addAll(entryName); - return name.toString(); } else { if (containerLog.isTraceEnabled()) { containerLog.trace(" search returned absolute name: " + resultName); @@ -2747,14 +2747,14 @@ public class JNDIRealm extends RealmBase "Search returned unparseable absolute name: " + resultName ); } - Name name = parser.parse(pathComponent.substring(1)); - return name.toString(); + name = parser.parse(pathComponent.substring(1)); } catch ( URISyntaxException e ) { throw new InvalidNameException( "Search returned unparseable absolute name: " + resultName ); } } + return name.toString(); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org