Update of /var/cvs/src/org/mmbase/core/event
In directory james.mmbase.org:/tmp/cvs-serv21467

Modified Files:
      Tag: MMBase-1_8
        NodeEvent.java 
Log Message:
determining otype cannot be reliably done with the two maps, simply using the 
builder name


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/core/event


Index: NodeEvent.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/core/event/NodeEvent.java,v
retrieving revision 1.27.2.3
retrieving revision 1.27.2.4
diff -u -b -r1.27.2.3 -r1.27.2.4
--- NodeEvent.java      6 Feb 2008 16:53:50 -0000       1.27.2.3
+++ NodeEvent.java      7 Feb 2008 16:41:14 -0000       1.27.2.4
@@ -24,7 +24,7 @@
  *
  * @author  Ernst Bunders
  * @since   MMBase-1.8
- * @version $Id: NodeEvent.java,v 1.27.2.3 2008/02/06 16:53:50 michiel Exp $
+ * @version $Id: NodeEvent.java,v 1.27.2.4 2008/02/07 16:41:14 michiel Exp $
  */
 public class NodeEvent extends Event {
 
@@ -240,9 +240,8 @@
         in.defaultReadObject();
         log.debug("deserialized node event for " + nodeNumber);
         try {
-            Object otype = oldValues.get("otype");
-            if (otype == null) otype = newValues.get("otype");
-            if (otype != null) {
+            int otype = 
MMBase.getMMBase().getTypeDef().getIntValue(builderName);
+            if (otype != -1) {
                 Cache typeCache = Cache.getCache("TypeCache");
                 if (typeCache != null) {
                     Integer node = new Integer(nodeNumber);
@@ -262,7 +261,7 @@
                     log.service("No typecache?");
                 }
             } else {
-                log.service("No otype found in " + newValues + " nor in " + 
oldValues + " from " + nodeNumber + " originating from " + getMachine());
+                log.service("Builder '" + builderName + "' from " + nodeNumber 
+ " not found. Originating from " + getMachine());
             }
         } catch (Exception e) {
              log.error(e);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to