cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup BootstrapService.java

[remm]

remm        01/09/12 14:15:59

  Modified:    catalina/src/share/org/apache/catalina/startup
                        BootstrapService.java
  Log:
  - Forgot to apply some patches to BootstrapService, which made the
    init of StandardClassLoader fail.
    Thanks to blakest at diebold.com (sorry, I couldn't find your full name anywhere)
    for the report and the patch.
  
  Revision  Changes    Path
  1.6       +7 -7      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/BootstrapService.java
  
  Index: BootstrapService.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/BootstrapService.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BootstrapService.java     2001/09/11 23:34:43     1.5
  +++ BootstrapService.java     2001/09/12 21:15:59     1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/BootstrapService.java,v
 1.5 2001/09/11 23:34:43 craigmcc Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/09/11 23:34:43 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/BootstrapService.java,v
 1.6 2001/09/12 21:15:59 remm Exp $
  + * $Revision: 1.6 $
  + * $Date: 2001/09/12 21:15:59 $
    *
    * ====================================================================
    *
  @@ -86,7 +86,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.5 $ $Date: 2001/09/11 23:34:43 $
  + * @version $Revision: 1.6 $ $Date: 2001/09/12 21:15:59 $
    */
   
   public final class BootstrapService 
  @@ -394,7 +394,7 @@
               classes.isDirectory()) {
               try {
                   URL url = new URL("file", null,
  -                                  classes.getCanonicalPath() + "/");
  +                                  classes.getCanonicalPath() + File.separator);
                   if (debug >= 1)
                       log("  Adding " + url.toString());
                   list.add(url.toString());
  @@ -462,7 +462,7 @@
               classes.isDirectory()) {
               try {
                   URL url = new URL("file", null,
  -                                  classes.getCanonicalPath() + "/");
  +                                  classes.getCanonicalPath() + File.separator);
                   if (debug >= 1)
                       log("  Adding " + url.toString());
                   list.add(url.toString());
  @@ -527,7 +527,7 @@
               classes.isDirectory()) {
               try {
                   URL url = new URL("file", null,
  -                                  classes.getCanonicalPath() + "/");
  +                                  classes.getCanonicalPath() + File.separator);
                   if (debug >= 1)
                       log("  Adding " + url.toString());
                   list.add(url.toString());