Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 8684 invoked from network); 20 Jul 2005 21:12:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Jul 2005 21:12:54 -0000 Received: (qmail 25351 invoked by uid 500); 20 Jul 2005 21:12:47 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 25299 invoked by uid 500); 20 Jul 2005 21:12:47 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 25286 invoked by uid 500); 20 Jul 2005 21:12:46 -0000 Received: (qmail 25283 invoked by uid 99); 20 Jul 2005 21:12:46 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 20 Jul 2005 14:12:35 -0700 Received: (qmail 8493 invoked by uid 1787); 20 Jul 2005 21:12:33 -0000 Date: 20 Jul 2005 21:12:33 -0000 Message-ID: <20050720211233.8492.qmail@minotaur.apache.org> From: markt@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/java SelectorContext.java X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org