remm 01/11/15 17:21:51
Modified: catalina/src/share/org/apache/catalina/loader Tag:
tomcat_40_branch StandardClassLoader.java
Log:
- Port fix for a race condition in the SCL, where defineClass could be called
multiple times on the same class.
Revision Changes Path
No revision
No revision
1.24.2.1 +7 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java
Index: StandardClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -r1.24 -r1.24.2.1
--- StandardClassLoader.java 2001/09/10 17:42:50 1.24
+++ StandardClassLoader.java 2001/11/16 01:21:51 1.24.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
1.24 2001/09/10 17:42:50 remm Exp $
- * $Revision: 1.24 $
- * $Date: 2001/09/10 17:42:50 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
1.24.2.1 2001/11/16 01:21:51 remm Exp $
+ * $Revision: 1.24.2.1 $
+ * $Date: 2001/11/16 01:21:51 $
*
* ====================================================================
*
@@ -112,7 +112,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.24 $ $Date: 2001/09/10 17:42:50 $
+ * @version $Revision: 1.24.2.1 $ $Date: 2001/11/16 01:21:51 $
*/
public class StandardClassLoader
@@ -668,6 +668,9 @@
log(" super.findClass(" + name + ")");
try {
synchronized (this) {
+ clazz = findLoadedClass(name);
+ if (clazz != null)
+ return clazz;
clazz = super.findClass(name);
}
} catch(AccessControlException ace) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
