cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/compat Jdk11Compat.java Jdk12Support.java

[costin]

costin      01/08/15 17:20:47

  Modified:    src/share/org/apache/tomcat/util/compat Jdk11Compat.java
                        Jdk12Support.java
  Log:
  Added getParentLoader to the jdk compat package. It's used in few places,
  better have a 1.1 compatible way.
  
  Revision  Changes    Path
  1.8       +12 -2     
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Jdk11Compat.java  2001/08/03 02:52:08     1.7
  +++ Jdk11Compat.java  2001/08/16 00:20:47     1.8
  @@ -113,11 +113,21 @@
        return null;
       }
   
  +    public ClassLoader getParentLoader( ClassLoader cl ) {
  +     if( cl instanceof DependClassLoader ) {
  +         return ((DependClassLoader)cl).getParentLoader();
  +     }
  +     if( cl instanceof SimpleClassLoader ) {
  +         return ((SimpleClassLoader)cl).getParentLoader();
  +                 }
  +     return null;
  +    }
  +    
       public URL[] getURLs(ClassLoader cl,int depth){
           int c=0;
           do{
  -            while(! (cl instanceof SimpleClassLoader))
  -                cl=((DependClassLoader)cl).getParentLoader();
  +            while( cl instanceof DependClassLoader && cl!=null)
  +           cl=((DependClassLoader)cl).getParentLoader();
               if (depth==c) return ((SimpleClassLoader)cl).getURLs();
               c++;
               cl=((SimpleClassLoader)cl).getParentLoader();
  
  
  
  1.5       +14 -1     
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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Jdk12Support.java 2001/07/19 21:43:02     1.4
  +++ Jdk12Support.java 2001/08/16 00:20:47     1.5
  @@ -105,10 +105,23 @@
        return Thread.currentThread().getContextClassLoader();
       }
       
  +    public ClassLoader getParentLoader( ClassLoader cl ) {
  +     if( cl instanceof DependClassLoader ) {
  +         return ((DependClassLoader)cl).getParentLoader();
  +     }
  +     if( cl instanceof SimpleClassLoader ) {
  +         return ((SimpleClassLoader)cl).getParentLoader();
  +     }
  +     if( cl instanceof URLClassLoader ) {
  +         return ((URLClassLoader)cl).getParent();
  +     }
  +     return null;
  +    }
  +    
       public URL[] getURLs(ClassLoader cl,int depth){
           int c=0;
           do{
  -            while(! (cl instanceof URLClassLoader) && cl != null )
  +            while(cl instanceof DependClassLoader && cl != null )
                   cl=((DependClassLoader)cl).getParentLoader();
               if (cl==null) break;
               if (depth==c) return ((URLClassLoader)cl).getURLs();