tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup Main.java
Date Sat, 10 Feb 2001 15:56:36 GMT
costin      01/02/10 07:56:35

  Modified:    src/share/org/apache/tomcat/startup Main.java
  Log:
  CVS did an automatic merge, and got one line wrong. Sorry for that.
  
  Now the build should work again.
  
  Revision  Changes    Path
  1.22      +2 -1      jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Main.java	2001/02/10 08:12:41	1.21
  +++ Main.java	2001/02/10 15:56:33	1.22
  @@ -188,7 +188,8 @@
   
               URL[] sharedClassPath=getURLs(getClassPathV(getSharedDir()));
               URL[] commonClassPath=getURLs(getClassPathV(getCommonDir()));
  -	    // XXX Should be: JdkCompat.newClassLoaderInstance !!            ClassLoader commonCl=
IntrospectionUtils.getURLClassLoader(commonClassPath , parentL );
  +	    // XXX Should be: JdkCompat.newClassLoaderInstance !!
  +	    ClassLoader commonCl= IntrospectionUtils.getURLClassLoader(commonClassPath , parentL
);
   	    ClassLoader sharedCl= IntrospectionUtils.getURLClassLoader(sharedClassPath , commonCl
);
               ClassLoader serverCl= IntrospectionUtils.getURLClassLoader(serverClassPath
, commonCl );
   	    if( commonCl==null ) {
  
  
  

Mime
View raw message