markt       2004/05/22 09:55:14

  Modified:    jasper2/src/share/org/apache/jasper/compiler Tag:
                        tomcat_4_branch Compiler.java
  Log:
  Ensure spaces in tomcat install path (if any) are decoded before
  passing to javac. This was causing the admin app to fail when
  deployed in uncompiled form to a tomcat instance with a spcae in
  it's path.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.18.2.17 +6 -4      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
  
  Index: Compiler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
  retrieving revision 1.18.2.16
  retrieving revision 1.18.2.17
  diff -u -r1.18.2.16 -r1.18.2.17
  --- Compiler.java     5 May 2004 22:04:42 -0000       1.18.2.16
  +++ Compiler.java     22 May 2004 16:55:14 -0000      1.18.2.17
  @@ -80,6 +80,7 @@
   import org.apache.jasper.logging.Logger;
   import org.apache.jasper.util.SystemLogHandler;
   import org.apache.jasper.runtime.HttpJspBase;
  +import org.apache.jasper.runtime.JspRuntimeLibrary;
   import org.apache.jasper.servlet.JspServletWrapper;
   
   /**
  @@ -280,7 +281,8 @@
           path.setPath(System.getProperty("java.class.path"));
           StringTokenizer tokenizer = new StringTokenizer(classpath, sep);
           while (tokenizer.hasMoreElements()) {
  -            String pathElement = tokenizer.nextToken();
  +            String pathElement =
  +                JspRuntimeLibrary.decode(tokenizer.nextToken());
               File repository = new File(pathElement);
               path.setLocation(repository);
               info.append("     cp=" + repository + "\n");
  
  
  

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

Reply via email to