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

[remm]

remm        2002/12/16 01:04:22

  Modified:    catalina/src/share/org/apache/naming/resources
                        ProxyDirContext.java
  Log:
  - Should fix cache invalidation when creating subcontexts and
    modify atributes.
  - Fix WebDAV (bug 15378).
  
  Revision  Changes    Path
  1.4       +26 -8     
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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ProxyDirContext.java      10 Oct 2002 07:41:27 -0000      1.3
  +++ ProxyDirContext.java      16 Dec 2002 09:04:22 -0000      1.4
  @@ -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.toString());
  +        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:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>