geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1139342 - /geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java
Date Fri, 24 Jun 2011 14:50:22 GMT
Author: gawor
Date: Fri Jun 24 14:50:22 2011
New Revision: 1139342

URL: http://svn.apache.org/viewvc?rev=1139342&view=rev
Log:
web.xml is optional

Modified:
    geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java?rev=1139342&r1=1139341&r2=1139342&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java
(original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java
Fri Jun 24 14:50:22 2011
@@ -179,6 +179,9 @@ public class GeronimoTldLocationsCache e
         WebXml webXml = null;
         try {
             webXml = new WebXml(ctxt);
+            if (webXml.getInputSource() == null) {
+                return;
+            }
             
             // Parse the web application deployment descriptor
             TreeNode webtld = null;



Mime
View raw message