cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources BaseDirContext.java ProxyDirContext.java

2005-07-20 Thread markt 
markt   2005/07/20 14:03:18

  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  ChangesPath
  1.10  +11 -11
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java
  
  Index: NamingContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- NamingContext.java26 Aug 2004 21:46:17 -  1.9
  +++ NamingContext.java20 Jul 2005 21:03:18 -  1.10
  @@ -236,8 +236,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));
  @@ -445,8 +445,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));
  @@ -581,8 +581,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;
   
  @@ -632,8 +632,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);
   }
   
   
  @@ -822,8 +822,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.4   +5 -5  
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/SelectorContext.java
  
  Index: SelectorContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/SelectorContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SelectorContext.java  26 Aug 2004 21:46:17 -  1.3
  +++ SelectorContext.java  20 Jul 2005 21:03:18 -  1.4
  @@ -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.7   +12 -12
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java
  
  Index: BaseDirContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BaseDirContext.java   4 Feb 2005 22:08:03 -   1.6
  +++ BaseDirContext.java   20 Jul 2005 21:03:18 -  1.7
  @@ -120,7 +120,7 @@
* Return the debugging detail level for this component.
*/
   public int getDebug() {
  - return (this.debug);
  +

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources BaseDirContext.java ProxyDirContext.java

2005-07-20 Thread markt 
markt   2005/07/20 14:09:51

  Modified:catalina/src/share/org/apache/naming NamingContext.java
SelectorContext.java
   catalina/src/share/org/apache/naming/resources
BaseDirContext.java ProxyDirContext.java
  Log:
  Fix bug 35769. composeName(Name, Name) returns wrong result.
   - Patch provided by Laurent Simon
  
  Revision  ChangesPath
  1.11  +2 -2  
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java
  
  Index: NamingContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- NamingContext.java20 Jul 2005 21:03:18 -  1.10
  +++ NamingContext.java20 Jul 2005 21:09:50 -  1.11
  @@ -632,7 +632,7 @@
*/
   public Name composeName(Name name, Name prefix)
   throws NamingException {
  -prefix = (Name) name.clone();
  +prefix = (Name) prefix.clone();
   return prefix.addAll(name);
   }
   
  
  
  
  1.5   +2 -2  
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/SelectorContext.java
  
  Index: SelectorContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/SelectorContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SelectorContext.java  20 Jul 2005 21:03:18 -  1.4
  +++ SelectorContext.java  20 Jul 2005 21:09:50 -  1.5
  @@ -504,7 +504,7 @@
*/
   public Name composeName(Name name, Name prefix)
   throws NamingException {
  -prefix = (Name) name.clone();
  +prefix = (Name) prefix.clone();
   return prefix.addAll(name);
   }
   
  
  
  
  1.8   +2 -2  
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java
  
  Index: BaseDirContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- BaseDirContext.java   20 Jul 2005 21:03:18 -  1.7
  +++ BaseDirContext.java   20 Jul 2005 21:09:50 -  1.8
  @@ -617,7 +617,7 @@
*/
   public Name composeName(Name name, Name prefix)
   throws NamingException {
  -prefix = (Name) name.clone();
  +prefix = (Name) prefix.clone();
   return prefix.addAll(name);
   }
   
  
  
  
  1.19  +2 -2  
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
  
  Index: ProxyDirContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ProxyDirContext.java  20 Jul 2005 21:03:18 -  1.18
  +++ ProxyDirContext.java  20 Jul 2005 21:09:50 -  1.19
  @@ -651,7 +651,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]