Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv19535
Modified Files:
NodeListHelper.java
Log Message:
support for empty strings in retain, remove attrs
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
Index: NodeListHelper.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/NodeListHelper.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- NodeListHelper.java 24 Jun 2008 10:49:05 -0000 1.39
+++ NodeListHelper.java 21 Oct 2008 18:28:53 -0000 1.40
@@ -27,7 +27,7 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: NodeListHelper.java,v 1.39 2008/06/24 10:49:05 michiel Exp $
+ * @version $Id: NodeListHelper.java,v 1.40 2008/10/21 18:28:53 michiel Exp $
* @since MMBase-1.7
*/
@@ -229,7 +229,7 @@
}
if (retain != Attribute.NULL) {
Object retainObject =
thisTag.getObjectConditional(retain.getString(thisTag));
- if (retainObject != null) {
+ if (retainObject != null && ! "".equals(retainObject)) {
if (retainObject instanceof Collection) {
nodes.retainAll((Collection<Node>) retainObject);
} else {
@@ -240,7 +240,7 @@
}
if (remove != Attribute.NULL) {
Object removeObject =
thisTag.getObjectConditional(remove.getString(thisTag));
- if (removeObject != null) {
+ if (removeObject != null && ! "".equals(removeObject)) {
if (removeObject instanceof Collection) {
nodes.removeAll((Collection<Node>) removeObject);
} else {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
