cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/depend DependClassLoader.java

[costin]

costin      01/09/13 21:58:30

  Modified:    src/share/org/apache/tomcat/util/depend
                        DependClassLoader.java
  Log:
  Fix from Bojan Smojver <[EMAIL PROTECTED]>, jar deps had the protocol in it.
  
  Submitted by: Bojan Smojver <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.9       +6 -3      
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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DependClassLoader.java    2001/09/07 04:25:20     1.8
  +++ DependClassLoader.java    2001/09/14 04:58:30     1.9
  @@ -87,7 +87,7 @@
       protected ClassLoader parent;
       protected ClassLoader parent2;
       
  -    final static int debug=0;
  +    final static int debug=10;
       DependManager dependM;
       protected Object pd;
       static Jdk11Compat jdkCompat=Jdk11Compat.getJdkCompat();
  @@ -238,8 +238,11 @@
            int idx=fileN.indexOf( "!" );
            if( idx>=0 )
                fileN=fileN.substring( 0, idx) ;
  -         f=new File( fileN );
  -         if( debug > 0 ) log( "Jar dep "  +f );
  +         // Bojan Smojver <[EMAIL PROTECTED]>: remove jar:
  +         if( fileN.startsWith( "jar:" ))
  +             fileN=fileN.substring( 4 );
  +         f=new File(fileN);
  +         if( debug > 0 ) log( "Jar dep "  +f + " " + f.exists() );
            if( ! f.exists()) f=null;
        }