costin 01/08/21 21:44:50
Modified: src/share/org/apache/tomcat/util/compat Jdk11Compat.java
Jdk12Support.java
src/share/org/apache/tomcat/util/depend
DependClassLoader.java DependClassLoader12.java
Log:
Added one more element to the compat packate - Policy.refresh() ( used in Main, after
changing the policy file ).
Fixed JDK1.1 compatibility in DependClassLoader, everything is back ( and DCL is
fixed,
reloading should be almost perfect - almost because module reloading is still not
completed )
Revision Changes Path
1.10 +4 -0
jakarta-tomcat/src/share/org/apache/tomcat/util/compat/Jdk11Compat.java
Index: Jdk11Compat.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/compat/Jdk11Compat.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Jdk11Compat.java 2001/08/21 04:44:02 1.9
+++ Jdk11Compat.java 2001/08/22 04:44:49 1.10
@@ -111,6 +111,10 @@
// nothing
}
+ public void refreshPolicy() {
+ // nothing
+ }
+
/** Get the context class loader, if java2.
*/
public ClassLoader getContextClassLoader() {
1.7 +4 -0
jakarta-tomcat/src/share/org/apache/tomcat/util/compat/Jdk12Support.java
Index: Jdk12Support.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/compat/Jdk12Support.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Jdk12Support.java 2001/08/21 04:44:02 1.6
+++ Jdk12Support.java 2001/08/22 04:44:49 1.7
@@ -101,6 +101,10 @@
}
}
+ public void refreshPolicy() {
+ Policy.getPolicy().refresh();
+ }
+
public void setContextClassLoader( ClassLoader cl ) {
// we can't doPrivileged here - it'll be a major security
// problem
1.7 +23 -0
jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader.java
Index: DependClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DependClassLoader.java 2001/08/21 04:48:35 1.6
+++ DependClassLoader.java 2001/08/22 04:44:50 1.7
@@ -91,9 +91,32 @@
DependManager dependM;
protected Object pd;
static Jdk11Compat jdkCompat=Jdk11Compat.getJdkCompat();
+
+ public static DependClassLoader getDependClassLoader( DependManager depM,
+ ClassLoader parent,
+ Object pd ) {
+ if( jdkCompat.isJava2() ) {
+ try {
+ Class c=Class.forName(
"org.apache.tomcat.util.depend.DependClassLoader12");
+ DependClassLoader dcl=(DependClassLoader)c.newInstance();
+ dcl.init( depM, parent, pd );
+ return dcl;
+ } catch(Exception ex ) {
+ ex.printStackTrace();
+ }
+ }
+ return new DependClassLoader( depM, parent, pd );
+ }
+
+ DependClassLoader() {
+ }
public DependClassLoader( DependManager depM, ClassLoader parent, Object pd ) {
super(); // will check permissions
+ init( depM, parent, pd );
+ }
+
+ void init( DependManager depM, ClassLoader parent, Object pd ) {
this.parent=parent;
this.parent2=jdkCompat.getParentLoader( parent );
dependM=depM;
1.3 +3 -1
jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader12.java
Index: DependClassLoader12.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader12.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DependClassLoader12.java 2001/08/21 06:09:06 1.2
+++ DependClassLoader12.java 2001/08/22 04:44:50 1.3
@@ -70,7 +70,9 @@
*
*/
public class DependClassLoader12 extends DependClassLoader {
-
+ DependClassLoader12() {
+ }
+
public DependClassLoader12( DependManager depM, ClassLoader parent, Object pd )
{
super(depM, parent, pd);
}
