markt 2005/07/20 14:21:30 Modified: catalina/src/share/org/apache/naming NamingContext.java SelectorContext.java catalina/src/share/org/apache/naming/resources BaseDirContext.java ProxyDirContext.java Log: Tabs to 8 spaces. Revision Changes Path 1.7 +11 -11 jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/NamingContext.java Index: NamingContext.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/NamingContext.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- NamingContext.java 29 Aug 2004 16:46:15 -0000 1.6 +++ NamingContext.java 20 Jul 2005 21:21:30 -0000 1.7 @@ -241,8 +241,8 @@ throws NamingException { checkWritable(); - while ((!name.isEmpty()) && (name.get(0).length() == 0)) - name = name.getSuffix(1); + while ((!name.isEmpty()) && (name.get(0).length() == 0)) + name = name.getSuffix(1); if (name.isEmpty()) throw new NamingException (sm.getString("namingContext.invalidName")); @@ -450,8 +450,8 @@ checkWritable(); - while ((!name.isEmpty()) && (name.get(0).length() == 0)) - name = name.getSuffix(1); + while ((!name.isEmpty()) && (name.get(0).length() == 0)) + name = name.getSuffix(1); if (name.isEmpty()) throw new NamingException (sm.getString("namingContext.invalidName")); @@ -586,8 +586,8 @@ public NameParser getNameParser(Name name) throws NamingException { - while ((!name.isEmpty()) && (name.get(0).length() == 0)) - name = name.getSuffix(1); + while ((!name.isEmpty()) && (name.get(0).length() == 0)) + name = name.getSuffix(1); if (name.isEmpty()) return nameParser; @@ -637,8 +637,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); } @@ -829,8 +829,8 @@ checkWritable(); - while ((!name.isEmpty()) && (name.get(0).length() == 0)) - name = name.getSuffix(1); + while ((!name.isEmpty()) && (name.get(0).length() == 0)) + name = name.getSuffix(1); if (name.isEmpty()) throw new NamingException (sm.getString("namingContext.invalidName")); 1.3 +5 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/SelectorContext.java Index: SelectorContext.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/SelectorContext.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SelectorContext.java 27 Feb 2004 14:58:53 -0000 1.2 +++ SelectorContext.java 20 Jul 2005 21:21:30 -0000 1.3 @@ -504,8 +504,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); } @@ -651,7 +651,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) { @@ -675,7 +675,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 { 1.6 +10 -10 jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/BaseDirContext.java Index: BaseDirContext.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/BaseDirContext.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- BaseDirContext.java 23 Jun 2004 16:59:42 -0000 1.5 +++ BaseDirContext.java 20 Jul 2005 21:21:30 -0000 1.6 @@ -116,7 +116,7 @@ * Return the document root for this component. */ public String getDocBase() { - return (this.docBase); + return (this.docBase); } @@ -132,13 +132,13 @@ */ public void setDocBase(String docBase) { - // Validate the format of the proposed document root - if (docBase == null) - throw new IllegalArgumentException - (sm.getString("resources.null")); + // Validate the format of the proposed document root + if (docBase == null) + throw new IllegalArgumentException + (sm.getString("resources.null")); - // Change the document root property - this.docBase = docBase; + // Change the document root property + this.docBase = docBase; } @@ -595,8 +595,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); } 1.17 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java Index: ProxyDirContext.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ProxyDirContext.java 13 Jul 2004 09:40:47 -0000 1.16 +++ ProxyDirContext.java 20 Jul 2005 21:21:30 -0000 1.17 @@ -686,7 +686,7 @@ public Name composeName(Name name, Name prefix) throws NamingException { prefix = (Name) name.clone(); - return prefix.addAll(name); + return prefix.addAll(name); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]