tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader WebappClassLoader.java
Date Wed, 30 Mar 2005 13:01:00 GMT
remm        2005/03/30 05:01:00

  Modified:    catalina/src/share/org/apache/catalina/loader
                        WebappClassLoader.java
  Log:
  - 33743: Additional syncs, since checking binaryContent== null by itself is unreliable.
  
  Revision  Changes    Path
  1.48      +7 -3      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
  
  Index: WebappClassLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- WebappClassLoader.java	21 Mar 2005 15:59:26 -0000	1.47
  +++ WebappClassLoader.java	30 Mar 2005 13:01:00 -0000	1.48
  @@ -1569,14 +1569,18 @@
   
           entry = findResourceInternal(name, classPath);
   
  -        if ((entry == null) || (entry.binaryContent == null
  -                && entry.loadedClass == null))
  +        if (entry == null)
               throw new ClassNotFoundException(name);
   
           Class clazz = entry.loadedClass;
           if (clazz != null)
               return clazz;
   
  +        synchronized (this) {
  +            if (entry.binaryContent == null && entry.loadedClass == null)
  +                throw new ClassNotFoundException(name);
  +        }
  +
           // Looking up the package
           String packageName = null;
           int pos = name.lastIndexOf('.');
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message