54 lines
2.4 KiB
Diff
54 lines
2.4 KiB
Diff
|
From 36710841d24807a6837757a24952ab5e6ced6ec8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mark Thomas <markt@apache.org>
|
||
|
|
Date: Wed, 23 Jan 2019 15:09:37 +0000
|
||
|
|
Subject: [PATCH] Refactor to simplify the fix for BZ 63026
|
||
|
|
|
||
|
|
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk@1851939 13f79535-47bb-0310-9956-ffa450edef68
|
||
|
|
---
|
||
|
|
java/org/apache/catalina/realm/JNDIRealm.java | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java b/java/org/apache/catalina/realm/JNDIRealm.java
|
||
|
|
index b624c5b..5714496 100644
|
||
|
|
--- a/java/org/apache/catalina/realm/JNDIRealm.java
|
||
|
|
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
|
||
|
|
@@ -2763,6 +2763,7 @@ System.out.println("userRoleName " + userRoleName + " " + attrs.get(userRoleName
|
||
|
|
// 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);
|
||
|
|
@@ -2774,9 +2775,8 @@ System.out.println("userRoleName " + userRoleName + " " + attrs.get(userRoleName
|
||
|
|
// 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);
|
||
|
|
@@ -2792,14 +2792,14 @@ System.out.println("userRoleName " + userRoleName + " " + attrs.get(userRoleName
|
||
|
|
"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();
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
--
|
||
|
|
2.23.0
|
||
|
|
|