commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pste...@apache.org
Subject cvs commit: jakarta-commons-sandbox/naming/core/src/java/org/apache/commons/naming/resources BaseDirContext.java ProxyDirContext.java
Date Sun, 30 Nov 2003 05:22:15 GMT
psteitz     2003/11/29 21:22:15

  Modified:    naming/core/src/java/org/apache/commons/naming
                        NamingContext.java SelectorContext.java
               naming/core/src/java/org/apache/commons/naming/resources
                        BaseDirContext.java ProxyDirContext.java
  Log:
  Fixed bug in composeName(Name, Name).
  
  Revision  Changes    Path
  1.3       +7 -7      jakarta-commons-sandbox/naming/core/src/java/org/apache/commons/naming/NamingContext.java
  
  Index: NamingContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/naming/core/src/java/org/apache/commons/naming/NamingContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NamingContext.java	13 Oct 2003 08:16:47 -0000	1.2
  +++ NamingContext.java	30 Nov 2003 05:22:15 -0000	1.3
  @@ -679,8 +679,8 @@
        */
       public Name composeName(Name name, Name prefix)
           throws NamingException {
  -	prefix = (Name) name.clone();
  -	return prefix.addAll(name);
  +	Name result = (Name) prefix.clone();
  +	return result.addAll(name);
       }
   
   
  @@ -857,7 +857,7 @@
        * must already exist.
        * 
        * @param name the name to bind; may not be empty
  -     * @param object the object to bind; possibly null
  +     * @param obj the object to bind; possibly null
        * @param rebind if true, then perform a rebind (ie, overwrite)
        * @exception NameAlreadyBoundException if name is already bound
        * @exception InvalidAttributesException if object did not supply all 
  
  
  
  1.3       +6 -6      jakarta-commons-sandbox/naming/core/src/java/org/apache/commons/naming/SelectorContext.java
  
  Index: SelectorContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/naming/core/src/java/org/apache/commons/naming/SelectorContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SelectorContext.java	13 Oct 2003 08:16:47 -0000	1.2
  +++ SelectorContext.java	30 Nov 2003 05:22:15 -0000	1.3
  @@ -551,8 +551,8 @@
        */
       public Name composeName(Name name, Name prefix)
           throws NamingException {
  -	prefix = (Name) name.clone();
  -	return prefix.addAll(name);
  +	Name result = (Name) prefix.clone();
  +	return result.addAll(name);
       }
   
   
  
  
  
  1.3       +6 -6      jakarta-commons-sandbox/naming/core/src/java/org/apache/commons/naming/resources/BaseDirContext.java
  
  Index: BaseDirContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/naming/core/src/java/org/apache/commons/naming/resources/BaseDirContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BaseDirContext.java	13 Oct 2003 08:15:53 -0000	1.2
  +++ BaseDirContext.java	30 Nov 2003 05:22:15 -0000	1.3
  @@ -668,8 +668,8 @@
        */
       public Name composeName(Name name, Name prefix)
           throws NamingException {
  -	prefix = (Name) name.clone();
  -	return prefix.addAll(name);
  +	Name result = (Name) prefix.clone();
  +	return result.addAll(name);
       }
   
   
  
  
  
  1.3       +6 -6      jakarta-commons-sandbox/naming/core/src/java/org/apache/commons/naming/resources/ProxyDirContext.java
  
  Index: ProxyDirContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/naming/core/src/java/org/apache/commons/naming/resources/ProxyDirContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProxyDirContext.java	13 Oct 2003 08:15:54 -0000	1.2
  +++ ProxyDirContext.java	30 Nov 2003 05:22:15 -0000	1.3
  @@ -700,8 +700,8 @@
        */
       public Name composeName(Name name, Name prefix)
           throws NamingException {
  -        prefix = (Name) name.clone();
  -	return prefix.addAll(name);
  +        Name result = (Name) prefix.clone();
  +	return result.addAll(name);
       }
   
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message