remm 2004/09/16 08:30:33
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
catalina/src/share/org/apache/catalina/startup
ContextConfig.java
Log:
- Add check for directory before considering something is a compressed WAR.
Revision Changes Path
1.146 +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.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- StandardContext.java 1 Sep 2004 22:55:48 -0000 1.145
+++ StandardContext.java 16 Sep 2004 15:30:32 -0000 1.146
@@ -3921,7 +3921,7 @@
if (log.isDebugEnabled())
log.debug("Configuring default Resources");
try {
- if ((docBase != null) && (docBase.endsWith(".war")))
+ if ((docBase != null) && (docBase.endsWith(".war")) && ((new
File(docBase)).isFile()))
setResources(new WARDirContext());
else
setResources(new FileDirContext());
1.54 +2 -2
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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ContextConfig.java 6 Sep 2004 15:02:07 -0000 1.53
+++ ContextConfig.java 16 Sep 2004 15:30:33 -0000 1.54
@@ -752,7 +752,7 @@
docBase = file.getCanonicalPath();
}
- if (docBase.toLowerCase().endsWith(".war") && unpackWARs) {
+ if (docBase.toLowerCase().endsWith(".war") && file.isFile() && unpackWARs) {
URL war = new URL("jar:" + (new File(docBase)).toURL() + "!/");
String contextPath = context.getPath();
if (contextPath.equals("")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
