Author: markt
Date: Wed Dec 4 21:42:21 2013
New Revision: 1547926
URL: http://svn.apache.org/r1547926
Log:
In Tomcat 7.0.x, resources are still split between servlet and jsp.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java?rev=1547926&r1=1547925&r2=1547926&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
Wed Dec 4 21:42:21 2013
@@ -16,6 +16,7 @@
*/
package org.apache.tomcat.util.descriptor;
+import java.net.URL;
import java.util.HashMap;
import java.util.Map;
@@ -89,7 +90,11 @@ public class DigesterFactory {
}
private static String idFor(String url) {
- return ServletContext.class.getResource("resources/" +
url).toExternalForm();
+ URL id = ServletContext.class.getResource("resources/" + url);
+ if (id == null) {
+ id = ServletContext.class.getResource("jsp/resources/" + url);
+ }
+ return id.toExternalForm();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
