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

[remm]

remm        2004/10/02 02:22:18

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
               catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java
  Log:
  - Fix (again) the check for an uncompressed folder ending with ".war".
  
  Revision  Changes    Path
  1.150     +2 -2      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.149
  retrieving revision 1.150
  diff -u -r1.149 -r1.150
  --- StandardContext.java      30 Sep 2004 19:29:04 -0000      1.149
  +++ StandardContext.java      2 Oct 2004 09:22:18 -0000       1.150
  @@ -3926,7 +3926,7 @@
               if (log.isDebugEnabled())
                   log.debug("Configuring default Resources");
               try {
  -                if ((docBase != null) && (docBase.endsWith(".war")) && (!(new 
File(docBase)).isDirectory()))
  +                if ((docBase != null) && (docBase.endsWith(".war")) && (!(new 
File(getBasePath())).isDirectory()))
                       setResources(new WARDirContext());
                   else
                       setResources(new FileDirContext());
  
  
  
  1.59      +2 -1      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
  
  Index: ContextConfig.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- ContextConfig.java        24 Sep 2004 07:25:07 -0000      1.58
  +++ ContextConfig.java        2 Oct 2004 09:22:18 -0000       1.59
  @@ -782,6 +782,7 @@
           } else {
               docBase = file.getCanonicalPath();
           }
  +        file = new File(docBase);
   
           if (docBase.toLowerCase().endsWith(".war") && !file.isDirectory() && 
unpackWARs) {
               URL war = new URL("jar:" + (new File(docBase)).toURL() + "!/");
  
  
  

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