cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader StandardClassLoader.java

[luehe]

luehe       2004/04/15 15:13:32

  Modified:    catalina/src/share/org/apache/catalina/loader
                        StandardClassLoader.java
  Log:
  2nd attempt for avoiding
  
    java.lang.NoClassDefFoundError: org/apache/tomcat/util/compat/JdkCompat
  
  in StandardClassLoader, by including above class in bootstrap.jar
  (undoing previous change)
  
  Revision  Changes    Path
  1.12      +11 -2     
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java
  
  Index: StandardClassLoader.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- StandardClassLoader.java  15 Apr 2004 21:39:48 -0000      1.11
  +++ StandardClassLoader.java  15 Apr 2004 22:13:32 -0000      1.12
  @@ -198,6 +198,15 @@
       }
   
   
  +    // ----------------------------------------------------- Class Variables
  +
  +
  +    /**
  +     * JDK compatibility support
  +     */
  +    private static final JdkCompat jdkCompat = JdkCompat.getJdkCompat();
  +
  +
       // ----------------------------------------------------- Instance Variables
   
   
  @@ -372,7 +381,7 @@
           } catch (MalformedURLException e) {
               IllegalArgumentException iae = new IllegalArgumentException
                   ("Invalid repository: " + repository);
  -            JdkCompat.getJdkCompat().chainException(iae, e);
  +            jdkCompat.chainException(iae, e);
               throw iae;
           }
   
  @@ -947,7 +956,7 @@
               } catch (Throwable t) {
                   IllegalArgumentException iae = new IllegalArgumentException
                       ("addRepositoryInternal");
  -                JdkCompat.getJdkCompat().chainException(iae, t);
  +                jdkCompat.chainException(iae, t);
                   throw iae;
               } finally {
                   if (jarFile != null) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]