tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/io FileUtil.java
Date Tue, 22 Jan 2002 06:09:51 GMT
billbarker    02/01/21 22:09:51

  Modified:    src/share/org/apache/tomcat/util/io FileUtil.java
  Log:
  Fix for Watchdog test failure with sandbox.
  
  It seems that nobody runs Watchdog under a sandbox, since this is reported failure.  Now
inculusion of static page works even with a sandbox.
  
  Revision  Changes    Path
  1.7       +6 -6      jakarta-tomcat/src/share/org/apache/tomcat/util/io/FileUtil.java
  
  Index: FileUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/io/FileUtil.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FileUtil.java	16 Aug 2001 00:19:20 -0000	1.6
  +++ FileUtil.java	22 Jan 2002 06:09:51 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/io/FileUtil.java,v
1.6 2001/08/16 00:19:20 costin Exp $
  - * $Revision: 1.6 $
  - * $Date: 2001/08/16 00:19:20 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/io/FileUtil.java,v
1.7 2002/01/22 06:09:51 billbarker Exp $
  + * $Revision: 1.7 $
  + * $Date: 2002/01/22 06:09:51 $
    *
    * ====================================================================
    *
  @@ -83,7 +83,7 @@
    */
   
   public class FileUtil {
  -
  +    static final String osName = System.getProperty("os.name");
       public static File[] listFiles(File dir) {
   
   	String[] ss = dir.list();
  @@ -273,7 +273,7 @@
           }
   
   	// fix path on NetWare - all '/' become '\\' and remove duplicate '\\'
  -	if (System.getProperty("os.name").startsWith("NetWare") &&
  +	if (osName.startsWith("NetWare") && 
   	    path.length() >=3 &&
   	    path.indexOf(':') > 0) {
   	    char[] ca = patchPath.replace('/', '\\').toCharArray();
  @@ -304,7 +304,7 @@
   	    return true;
   
   	// NetWare volume:
  -	if (System.getProperty("os.name").startsWith("NetWare") &&
  +	if (osName.startsWith("NetWare") &&
   	    path.length() >=3 &&
   	    path.indexOf(':') > 0)
   	    return true;
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message