Author: michiel
Date: 2009-11-24 10:14:49 +0100 (Tue, 24 Nov 2009)
New Revision: 39894
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/util/BasicBacking.java
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/util/CollectorBacking.java
Log:
this fixes the failing test-case
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/util/BasicBacking.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/util/BasicBacking.java
2009-11-24 09:14:00 UTC (rev 39893)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/util/BasicBacking.java
2009-11-24 09:14:49 UTC (rev 39894)
@@ -140,7 +140,7 @@
}
@Override
- public Set<Map.Entry<String, Object>> entrySet() {
+ public Set<Map.Entry<String, Object>> entrySet() {
return new AbstractSet<Map.Entry<String, Object>>() {
public int size() {
return b.size();
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/util/CollectorBacking.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/util/CollectorBacking.java
2009-11-24 09:14:00 UTC (rev 39893)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/util/CollectorBacking.java
2009-11-24 09:14:49 UTC (rev 39894)
@@ -54,15 +54,15 @@
assert parent != null;
if (reset || myKeys.contains(key)) {
parent.reregister(key, value);
- myKeys.add(key);
} else {
if (! parent.containsKey(key)) {
- myKeys.add(key);
parent.register(key, value);
} else {
parent.register(key, value);
}
}
+ myKeys.add(key);
+
boolean r = reset || myKeys.contains(key);
return super.put(key, value, r);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
