tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r469893 - /tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
Date Wed, 01 Nov 2006 12:56:34 GMT
Author: remm
Date: Wed Nov  1 04:56:33 2006
New Revision: 469893

URL: http://svn.apache.org/viewvc?view=rev&rev=469893
Log:
- Fix woops.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?view=diff&rev=469893&r1=469892&r2=469893
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Wed Nov  1
04:56:33 2006
@@ -195,14 +195,18 @@
             // JSP 2.1 Table JSP.8-3
             // handle deferredValue and deferredValueType
             boolean deferredValue = false;
+            boolean deferredValueSpecified = false;
             String deferredValueString = n.getAttributeValue("deferredValue");
             if (deferredValueString != null) {
+                deferredValueSpecified = true;
                 deferredValue = JspUtil.booleanValue(deferredValueString);
             }
             String deferredValueType = n.getAttributeValue("deferredValueType");
             if (deferredValueType != null) {
-                if (!deferredValue) {
+                if (deferredValueSpecified && !deferredValue) {
                     err.jspError(n, "jsp.error.deferredvaluetypewithoutdeferredvalue");
+                } else {
+                    deferredValue = true;
                 }
             } else if (deferredValue) {
                 deferredValueType = "java.lang.Object";
@@ -213,15 +217,19 @@
             // JSP 2.1 Table JSP.8-3
             // handle deferredMethod and deferredMethodSignature
             boolean deferredMethod = false;
+            boolean deferredMethodSpecified = false;
             String deferredMethodString = n.getAttributeValue("deferredMethod");
             if (deferredMethodString != null) {
+                deferredMethodSpecified = true;
                 deferredMethod = JspUtil.booleanValue(deferredMethodString);
             }
             String deferredMethodSignature = n
                     .getAttributeValue("deferredMethodSignature");
             if (deferredMethodSignature != null) {
-                if (!deferredMethod) {
+                if (deferredMethodSpecified && !deferredMethod) {
                     err.jspError(n, "jsp.error.deferredmethodsignaturewithoutdeferredmethod");
+                } else {
+                    deferredMethod = true;
                 }
             } else if (deferredMethod) {
                 deferredMethodSignature = "void methodname()";



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


Mime
View raw message