svn commit: r1542286 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

[markt]

Author: markt
Date: Fri Nov 15 15:09:09 2013
New Revision: 1542286

URL: http://svn.apache.org/r1542286
Log:
Normlization is now handled by the WebResourceRoot

Modified:
    tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1542286&r1=1542285&r2=1542286&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Nov 
15 15:09:09 2013
@@ -510,13 +510,9 @@ public class ApplicationContext
             throw new MalformedURLException(sm.getString(
                     "applicationContext.requestDispatcher.iae", path));
 
-        String normPath = RequestUtil.normalize(path);
-        if (normPath == null)
-            return (null);
-
         WebResourceRoot resources = context.getResources();
         if (resources != null) {
-            return resources.getResource(normPath).getURL();
+            return resources.getResource(path).getURL();
         }
 
         return null;
@@ -540,13 +536,9 @@ public class ApplicationContext
         if (!path.startsWith("/") && GET_RESOURCE_REQUIRE_SLASH)
             return null;
 
-        String normalizedPath = RequestUtil.normalize(path);
-        if (normalizedPath == null)
-            return (null);
-
         WebResourceRoot resources = context.getResources();
         if (resources != null) {
-            return resources.getResource(normalizedPath).getInputStream();
+            return resources.getResource(path).getInputStream();
         }
 
         return null;
@@ -573,13 +565,9 @@ public class ApplicationContext
                 (sm.getString("applicationContext.resourcePaths.iae", path));
         }
 
-        String normalizedPath = RequestUtil.normalize(path);
-        if (normalizedPath == null)
-            return (null);
-
         WebResourceRoot resources = context.getResources();
         if (resources != null) {
-            return resources.listWebAppPaths(normalizedPath);
+            return resources.listWebAppPaths(path);
         }
 
         return null;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org