markt 2005/07/20 14:12:32
Modified: naming/src/org/apache/naming/core Tag: TOMCAT_5_0
BaseContext.java
naming/src/org/apache/naming/modules/cache Tag: TOMCAT_5_0
ProxyDirContext.java
naming/src/org/apache/naming/modules/java Tag: TOMCAT_5_0
SelectorContext.java
Log:
Fix bug 35769. composeName(Name, Name) returns wrong result.
- Patch provided by Laurent Simon
Revision Changes Path
No revision
No revision
1.5.2.1 +1 -1
jakarta-tomcat-connectors/naming/src/org/apache/naming/core/BaseContext.java
Index: BaseContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/core/BaseContext.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- BaseContext.java 24 Feb 2004 08:58:08 -0000 1.5
+++ BaseContext.java 20 Jul 2005 21:12:32 -0000 1.5.2.1
@@ -414,7 +414,7 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
- prefix = (Name) name.clone();
+ prefix = (Name) prefix.clone();
return prefix.addAll(name);
}
No revision
No revision
1.3.2.2 +1 -1
jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/cache/ProxyDirContext.java
Index: ProxyDirContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/cache/ProxyDirContext.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- ProxyDirContext.java 20 Jul 2005 21:04:02 -0000 1.3.2.1
+++ ProxyDirContext.java 20 Jul 2005 21:12:32 -0000 1.3.2.2
@@ -606,7 +606,7 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
- prefix = (Name) name.clone();
+ prefix = (Name) prefix.clone();
return prefix.addAll(name);
}
No revision
No revision
1.5.2.2 +1 -1
jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/java/SelectorContext.java
Index: SelectorContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/java/SelectorContext.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- SelectorContext.java 20 Jul 2005 21:04:02 -0000 1.5.2.1
+++ SelectorContext.java 20 Jul 2005 21:12:32 -0000 1.5.2.2
@@ -500,7 +500,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]
