Author: markt
Date: Tue Jan 8 20:22:01 2013
New Revision: 1430486
URL: http://svn.apache.org/viewvc?rev=1430486&view=rev
Log:
Need to follow new rules on paths
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1430486&r1=1430485&r2=1430486&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Tue
Jan 8 20:22:01 2013
@@ -442,9 +442,9 @@ public class StandardRoot extends Lifecy
f = new File(((Host)context.getParent()).getAppBaseFile(),
f.getName());
}
if (f.isDirectory()) {
- main = new DirResourceSet(this, f.getAbsolutePath(), "", "");
+ main = new DirResourceSet(this, f.getAbsolutePath(), "/", "/");
} else if(f.isFile() && docBase.endsWith(".war")) {
- main = new JarResourceSet(this, f.getAbsolutePath(), "", "");
+ main = new JarResourceSet(this, f.getAbsolutePath(), "/", "/");
} else {
throw new IllegalArgumentException(
sm.getString("standardRoot.startInvalidMain"));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]