JRA-19051 SIM-263: Fix default factory to use toURI().toURL() such th…

…at sitemesh can work correctly when a web-app is deployed into a tomcat multi-context environment.
atlassian · Mar 2, 2015 · 63eae13 · 63eae13
1 parent 8d0ea0d
commit 63eae13
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/java/com/opensymphony/module/sitemesh/factory/DefaultFactory.java b/src/java/com/opensymphony/module/sitemesh/factory/DefaultFactory.java
@@ -143,7 +143,7 @@ private Element loadSitemeshXML()
             is = config.getServletContext().getResourceAsStream(configFileName);
         }
         else if (configFile.exists() && configFile.canRead()) {
-            is = configFile.toURL().openStream();
+            is = configFile.toURI().toURL().openStream();
         }
 
         if (is == null){ // load the default sitemesh configuration
@@ -181,7 +181,7 @@ private void loadExcludes()
             is = config.getServletContext().getResourceAsStream(excludesFileName);
         }
         else if (excludesFile.exists() && excludesFile.canRead()) {
-            is = excludesFile.toURL().openStream();
+            is = excludesFile.toURI().toURL().openStream();
         }
 
         if (is == null){