markt 2005/07/20 14:25:19
Modified: catalina/src/share/org/apache/naming NamingContext.java
SelectorContext.java
catalina/src/share/org/apache/naming/resources
BaseDirContext.java ProxyDirContext.java
Log:
Fix bug 35769. composeName(Name, Name) returns wrong result.
- Patch provided by Laurent Simon
- Ported from TC4
Revision Changes Path
1.8 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/NamingContext.java
Index: NamingContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/NamingContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NamingContext.java 20 Jul 2005 21:21:30 -0000 1.7
+++ NamingContext.java 20 Jul 2005 21:25:18 -0000 1.8
@@ -637,7 +637,7 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
- prefix = (Name) name.clone();
+ prefix = (Name) prefix.clone();
return prefix.addAll(name);
}
1.4 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/SelectorContext.java
Index: SelectorContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/SelectorContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SelectorContext.java 20 Jul 2005 21:21:30 -0000 1.3
+++ SelectorContext.java 20 Jul 2005 21:25:18 -0000 1.4
@@ -504,7 +504,7 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
- prefix = (Name) name.clone();
+ prefix = (Name) prefix.clone();
return prefix.addAll(name);
}
1.7 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/BaseDirContext.java
Index: BaseDirContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/BaseDirContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseDirContext.java 20 Jul 2005 21:21:30 -0000 1.6
+++ BaseDirContext.java 20 Jul 2005 21:25:18 -0000 1.7
@@ -595,7 +595,7 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
- prefix = (Name) name.clone();
+ prefix = (Name) prefix.clone();
return prefix.addAll(name);
}
1.18 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
Index: ProxyDirContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ProxyDirContext.java 20 Jul 2005 21:21:30 -0000 1.17
+++ ProxyDirContext.java 20 Jul 2005 21:25:18 -0000 1.18
@@ -685,7 +685,7 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
- prefix = (Name) name.clone();
+ prefix = (Name) prefix.clone();
return prefix.addAll(name);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
