remm        02/04/15 17:42:10

  Modified:    catalina/src/share/org/apache/naming ContextBindings.java
  Log:
  - Fix incorrect check.
  
  Revision  Changes    Path
  1.6       +6 -6      
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ContextBindings.java
  
  Index: ContextBindings.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ContextBindings.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ContextBindings.java      16 Apr 2002 00:37:52 -0000      1.5
  +++ ContextBindings.java      16 Apr 2002 00:42:10 -0000      1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ContextBindings.java,v
 1.5 2002/04/16 00:37:52 remm Exp $
  - * $Revision: 1.5 $
  - * $Date: 2002/04/16 00:37:52 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ContextBindings.java,v
 1.6 2002/04/16 00:42:10 remm Exp $
  + * $Revision: 1.6 $
  + * $Date: 2002/04/16 00:42:10 $
    *
    * ====================================================================
    *
  @@ -76,7 +76,7 @@
    * </ul>
    *
    * @author Remy Maucherat
  - * @version $Revision: 1.5 $ $Date: 2002/04/16 00:37:52 $
  + * @version $Revision: 1.6 $ $Date: 2002/04/16 00:42:10 $
    */
   
   public class ContextBindings {
  @@ -346,8 +346,8 @@
       public static void unbindClassLoader(Object name, Object token, 
                                            ClassLoader classLoader) {
           if (ContextAccessController.checkSecurityToken(name, token)) {
  -            Object cl = clBindings.get(name);
  -            if (cl != classLoader) {
  +            Object n = clNameBindings.get(classLoader);
  +            if (!(n.equals(name))) {
                   return;
               }
               clBindings.remove(classLoader);
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to