Author: mrdon
Date: Tue May 22 05:56:32 2007
New Revision: 540570
URL: http://svn.apache.org/viewvc?view=rev&rev=540570
Log:
Fixed NPE in subset iterator tag
WW-1932
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java?view=diff&rev=540570&r1=540569&r2=540570
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
Tue May 22 05:56:32 2007
@@ -194,7 +194,7 @@
// source
Object source = null;
- if (sourceAttr == null && sourceAttr.length() <= 0) {
+ if (sourceAttr == null || sourceAttr.length() == 0) {
source = findValue("top");
} else {
source = findValue(sourceAttr);