markt 2005/07/20 14:21:44 Modified: naming/src/org/apache/naming/modules/cache ProxyDirContext.java naming/src/org/apache/naming/modules/java SelectorContext.java Log: Tabs to 8 spaces. Revision Changes Path 1.4 +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 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ProxyDirContext.java 24 Feb 2004 08:58:09 -0000 1.3 +++ ProxyDirContext.java 20 Jul 2005 21:21:44 -0000 1.4 @@ -607,7 +607,7 @@ public Name composeName(Name name, Name prefix) throws NamingException { prefix = (Name) name.clone(); - return prefix.addAll(name); + return prefix.addAll(name); } 1.6 +4 -4 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 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- SelectorContext.java 24 Feb 2004 08:58:08 -0000 1.5 +++ SelectorContext.java 20 Jul 2005 21:21:44 -0000 1.6 @@ -500,8 +500,8 @@ */ public Name composeName(Name name, Name prefix) throws NamingException { - prefix = (Name) name.clone(); - return prefix.addAll(name); + prefix = (Name) name.clone(); + return prefix.addAll(name); } @@ -649,7 +649,7 @@ protected String parseName(String name) throws NamingException { - if ((!initialContext) && (name.startsWith(prefix))) { + if ((!initialContext) && (name.startsWith(prefix))) { return (name.substring(prefixLength)); } else { if (initialContext) { @@ -673,7 +673,7 @@ protected Name parseName(Name name) throws NamingException { - if ((!initialContext) && (!name.isEmpty()) + if ((!initialContext) && (!name.isEmpty()) && (name.get(0).equals(prefix))) { return (name.getSuffix(1)); } else {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]