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

[re...@apache.org]

remm        2003/01/14 04:37:05

  Modified:    catalina/src/share/org/apache/naming/resources
                        ProxyDirContext.java
  Log:
  - Port patch.
  - Should fix cache invalidation when creating subcontexts and
    modify atributes.
  - Fix WebDAV (bug 15378).
  
  Revision  Changes    Path
  1.15      +27 -9     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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ProxyDirContext.java	14 Oct 2002 14:31:23 -0000	1.14
  +++ ProxyDirContext.java	14 Jan 2003 12:37:05 -0000	1.15
  @@ -75,8 +75,8 @@
   import javax.naming.Context;
   import javax.naming.Name;
   import javax.naming.NameParser;
  -import javax.naming.NamingEnumeration;
   import javax.naming.NameNotFoundException;
  +import javax.naming.NamingEnumeration;
   import javax.naming.NamingException;
   import javax.naming.directory.DirContext;
   import javax.naming.directory.Attributes;
  @@ -594,7 +594,9 @@
        */
       public Context createSubcontext(Name name)
           throws NamingException {
  -        return dirContext.createSubcontext(parseName(name));
  +        Context context = dirContext.createSubcontext(parseName(name));
  +        cacheUnload(name.toString());
  +        return context;
       }
   
   
  @@ -610,7 +612,9 @@
        */
       public Context createSubcontext(String name)
           throws NamingException {
  -        return dirContext.createSubcontext(parseName(name));
  +        Context context = dirContext.createSubcontext(parseName(name));
  +        cacheUnload(name);
  +        return context;
       }
   
   
  @@ -905,6 +909,7 @@
       public void modifyAttributes(Name name, int mod_op, Attributes attrs)
           throws NamingException {
           dirContext.modifyAttributes(parseName(name), mod_op, attrs);
  +        cacheUnload(name.toString());
       }
   
   
  @@ -923,6 +928,7 @@
       public void modifyAttributes(String name, int mod_op, Attributes attrs)
           throws NamingException {
           dirContext.modifyAttributes(parseName(name), mod_op, attrs);
  +        cacheUnload(name);
       }
   
   
  @@ -943,6 +949,7 @@
       public void modifyAttributes(Name name, ModificationItem[] mods)
           throws NamingException {
           dirContext.modifyAttributes(parseName(name), mods);
  +        cacheUnload(name.toString());
       }
   
   
  @@ -960,6 +967,7 @@
       public void modifyAttributes(String name, ModificationItem[] mods)
           throws NamingException {
           dirContext.modifyAttributes(parseName(name), mods);
  +        cacheUnload(name);
       }
   
   
  @@ -981,6 +989,7 @@
       public void bind(Name name, Object obj, Attributes attrs)
           throws NamingException {
           dirContext.bind(parseName(name), obj, attrs);
  +        cacheUnload(name.toString());
       }
   
   
  @@ -998,6 +1007,7 @@
       public void bind(String name, Object obj, Attributes attrs)
           throws NamingException {
           dirContext.bind(parseName(name), obj, attrs);
  +        cacheUnload(name);
       }
   
   
  @@ -1022,6 +1032,7 @@
       public void rebind(Name name, Object obj, Attributes attrs)
           throws NamingException {
           dirContext.rebind(parseName(name), obj, attrs);
  +        cacheUnload(name.toString());
       }
   
   
  @@ -1039,6 +1050,7 @@
       public void rebind(String name, Object obj, Attributes attrs)
           throws NamingException {
           dirContext.rebind(parseName(name), obj, attrs);
  +        cacheUnload(name);
       }
   
   
  @@ -1061,7 +1073,10 @@
        */
       public DirContext createSubcontext(Name name, Attributes attrs)
           throws NamingException {
  -        return dirContext.createSubcontext(parseName(name), attrs);
  +        DirContext context = 
  +            dirContext.createSubcontext(parseName(name), attrs);
  +        cacheUnload(name.toString());
  +        return context;
       }
   
   
  @@ -1078,7 +1093,10 @@
        */
       public DirContext createSubcontext(String name, Attributes attrs)
           throws NamingException {
  -        return dirContext.createSubcontext(parseName(name), attrs);
  +        DirContext context = 
  +            dirContext.createSubcontext(parseName(name), attrs);
  +        cacheUnload(name);
  +        return context;
       }
   
   
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>