Author: mrdon
Date: Sat May 6 23:08:29 2006
New Revision: 403550
URL: http://svn.apache.org/viewcvs?rev=403550&view=rev
Log:
Allowing continued processing of attributes when found a null value and ignore
enabled
STR-2809
Modified:
struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java
Modified:
struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java?rev=403550&r1=403549&r2=403550&view=diff
==============================================================================
---
struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java
(original)
+++
struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java
Sat May 6 23:08:29 2006
@@ -153,10 +153,9 @@
Object value = compContext.getAttribute(name);
// Check if value exist and if we must send a runtime exception
if( value == null )
- if(!isErrorIgnored)
+ if(!isErrorIgnored) {
throw new JspException ( "Error - tag importAttribute : property '"+
name + "' not found in context. Check tag syntax" );
- else
- return SKIP_BODY;
+ }
pageContext.setAttribute(name, value, scope);
}
@@ -176,10 +175,9 @@
Object value = compContext.getAttribute(name);
// Check if value exist and if we must send a runtime exception
if( value == null ) {
- if(!isErrorIgnored)
+ if(!isErrorIgnored) {
throw new JspException ( "Error - tag importAttribute : property
'"+ name + "' has a value of 'null'" );
- else
- return SKIP_BODY;
+ }
}
pageContext.setAttribute(name, value, scope);
} // end loop
