remm 01/11/02 18:28:17
Modified: catalina/src/share/org/apache/catalina/loader Tag:
tomcat_40_branch WebappLoader.java
Log:
- Port from HEAD:
- The context root permission wasn't a canonical path.
Revision Changes Path
No revision
No revision
1.12.2.3 +12 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
Index: WebappLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -r1.12.2.2 -r1.12.2.3
--- WebappLoader.java 2001/10/16 07:02:54 1.12.2.2
+++ WebappLoader.java 2001/11/03 02:28:17 1.12.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
1.12.2.2 2001/10/16 07:02:54 remm Exp $
- * $Revision: 1.12.2.2 $
- * $Date: 2001/10/16 07:02:54 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
1.12.2.3 2001/11/03 02:28:17 remm Exp $
+ * $Revision: 1.12.2.3 $
+ * $Date: 2001/11/03 02:28:17 $
*
* ====================================================================
*
@@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.12.2.2 $ $Date: 2001/10/16 07:02:54 $
+ * @version $Revision: 1.12.2.3 $ $Date: 2001/11/03 02:28:17 $
*/
public class WebappLoader
@@ -809,7 +809,14 @@
String contextRoot = servletContext.getRealPath("/");
if (contextRoot != null) {
- classLoader.setPermissions(contextRoot);
+ try {
+ contextRoot =
+ (new File(contextRoot)).getCanonicalPath()
+ + File.separator;
+ classLoader.setPermissions(contextRoot);
+ } catch (IOException e) {
+ // Ignore
+ }
}
URL classesURL =
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
