Author: markt Date: Thu Mar 13 21:26:40 2014 New Revision: 1577324 URL: http://svn.apache.org/r1577324 Log: Simplify
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java?rev=1577324&r1=1577323&r2=1577324&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java Thu Mar 13 21:26:40 2014 @@ -140,10 +140,8 @@ public class DigesterFactory { private static String locationFor(String name) { URL location = CLASS_SERVLET_CONTEXT.getResource("resources/" + name); - if (location == null) { - if (CLASS_JSP_CONTEXT != null) { - location = CLASS_JSP_CONTEXT.getResource("resources/" + name); - } + if (location == null && CLASS_JSP_CONTEXT != null) { + location = CLASS_JSP_CONTEXT.getResource("resources/" + name); } if (location == null) { return null; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org