cvs commit: jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/java SelectorContext.java

[markt]

markt       2005/07/20 14:25:45

  Modified:    naming/src/org/apache/naming/core BaseContext.java
               naming/src/org/apache/naming/modules/cache
                        ProxyDirContext.java
               naming/src/org/apache/naming/modules/java
                        SelectorContext.java
  Log:
  Fix bug 35769. composeName(Name, Name) returns wrong result.
   - Patch provided by Laurent Simon
   - Ported from TC4
  
  Revision  Changes    Path
  1.6       +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.6
  diff -u -r1.5 -r1.6
  --- BaseContext.java  24 Feb 2004 08:58:08 -0000      1.5
  +++ BaseContext.java  20 Jul 2005 21:25:44 -0000      1.6
  @@ -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);
       }
   
  
  
  
  1.5       +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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ProxyDirContext.java      20 Jul 2005 21:21:44 -0000      1.4
  +++ ProxyDirContext.java      20 Jul 2005 21:25:44 -0000      1.5
  @@ -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);
       }
   
  
  
  
  1.7       +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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SelectorContext.java      20 Jul 2005 21:21:44 -0000      1.6
  +++ SelectorContext.java      20 Jul 2005 21:25:45 -0000      1.7
  @@ -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]