Author: michiel
Date: 2010-05-03 15:49:10 +0200 (Mon, 03 May 2010)
New Revision: 42089
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/core/event/NodeEventHelper.java
Log:
moved 'map clean up code' from Helper to NodeEvent itself (will target MMB-1850
now)
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/core/event/NodeEventHelper.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/core/event/NodeEventHelper.java
2010-05-03 13:40:18 UTC (rev 42088)
+++ mmbase/trunk/core/src/main/java/org/mmbase/core/event/NodeEventHelper.java
2010-05-03 13:49:10 UTC (rev 42089)
@@ -50,21 +50,24 @@
//fill the old and new values maps for the event
switch(eventType) {
case Event.TYPE_NEW:
- newEventValues = removeNonSerializingValues(node.getValues());
+ newEventValues = node.getValues();
oldEventValues = Collections.emptyMap();
break;
case Event.TYPE_CHANGE:
- oldEventValues = removeNonSerializingValues(node.getOldValues());
- newEventValues = new HashMap<String, Object>();
- Map<String, Object> values = node.getValues();
- for (String key : oldEventValues.keySet()) {
- newEventValues.put(key, values.get(key));
+ oldEventValues = node.getOldValues();
+ {
+ // this makes sure the old an new map contain the same keys.
+ Map<String, Object> help = new HashMap<String, Object>();
+ Map<String, Object> values = node.getValues();
+ for (String key : oldEventValues.keySet()) {
+ help.put(key, values.get(key));
+ }
+ newEventValues = help;
}
- newEventValues = removeNonSerializingValues(newEventValues);
break;
case Event.TYPE_DELETE:
newEventValues = Collections.emptyMap();
- oldEventValues = removeNonSerializingValues(node.getValues());
+ oldEventValues = node.getValues();
break;
default: {
oldEventValues = Collections.emptyMap();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
