markt 2005/07/20 14:09:51
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
Revision Changes Path
1.11 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java
Index: NamingContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NamingContext.java 20 Jul 2005 21:03:18 -0000 1.10
+++ NamingContext.java 20 Jul 2005 21:09:50 -0000 1.11
@@ -632,7 +632,7 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
- prefix = (Name) name.clone();
+ prefix = (Name) prefix.clone();
return prefix.addAll(name);
}
1.5 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/SelectorContext.java
Index: SelectorContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/SelectorContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SelectorContext.java 20 Jul 2005 21:03:18 -0000 1.4
+++ SelectorContext.java 20 Jul 2005 21:09:50 -0000 1.5
@@ -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.8 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java
Index: BaseDirContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaseDirContext.java 20 Jul 2005 21:03:18 -0000 1.7
+++ BaseDirContext.java 20 Jul 2005 21:09:50 -0000 1.8
@@ -617,7 +617,7 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
- prefix = (Name) name.clone();
+ prefix = (Name) prefix.clone();
return prefix.addAll(name);
}
1.19 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
Index: ProxyDirContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ProxyDirContext.java 20 Jul 2005 21:03:18 -0000 1.18
+++ ProxyDirContext.java 20 Jul 2005 21:09:50 -0000 1.19
@@ -651,7 +651,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]
