tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r890265 - /tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
Date Mon, 14 Dec 2009 10:37:01 GMT
Author: markt
Date: Mon Dec 14 10:37:01 2009
New Revision: 890265

URL: http://svn.apache.org/viewvc?rev=890265&view=rev
Log:
Test for null rather than waiting for the NPE ot be thrown.

Modified:
    tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=890265&r1=890264&r2=890265&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Mon Dec 14 10:37:01
2009
@@ -476,9 +476,12 @@
                 }
             }
 
-            if (jspFrame == null) {
+            
+            if (jspFrame == null ||
+                    this.ctxt.getCompiler().getPageNodes() == null) {
                 // If we couldn't find a frame in the stack trace corresponding
-                // to the generated servlet class, we can't really add anything
+                // to the generated servlet class or we don't have a copy of the
+                // parsed JSP to hand, we can't really add anything
                 return new JasperException(ex);
             }
             else {



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


Mime
View raw message