Author: michiel
Date: 2010-04-08 13:16:56 +0200 (Thu, 08 Apr 2010)
New Revision: 41792
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMObjectNode.java
Log:
VirtualNodeTest had a failing test-case
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMObjectNode.java
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMObjectNode.java
2010-04-08 10:52:07 UTC (rev 41791)
+++
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/module/core/MMObjectNode.java
2010-04-08 11:16:56 UTC (rev 41792)
@@ -62,8 +62,8 @@
* @since MMBase-1.8
*/
private Map<String, Object> oldValues = null;
-
-
+
+
/**
* Holds the name - value pairs of this node (the node's fields).
* Most nodes will have a 'number' and an 'otype' field, and fields which
will differ by builder.
@@ -97,7 +97,7 @@
* since the last commit.
*/
private Set<String> changed = null;
-
+
/**
* Pointer to the parent builder that is responsible for this node.
* Note: this may on occasion (due to optimization) differ for the node's
original builder.
@@ -214,7 +214,7 @@
}
return sizes;
}
-
+
/**
* Returns the actual builder of the node.
* Note that it is possible that, due to optimization, a node is currently
associated with
@@ -625,7 +625,10 @@
fieldValue = new SerializableInputStream((InputStream) fieldValue,
getSize(fieldName));
}
if (fieldValue instanceof Node) {
- fieldValue = Integer.valueOf(((Node) fieldValue).getNumber());
+ int number = ((Node) fieldValue).getNumber();
+ if (number != -1) { // -1 is very meaningless, and it will not be
possible to make a sensible node of that again
+ fieldValue = Integer.valueOf(number);
+ }
}
fieldValue = checkSerializable(fieldName, fieldValue);
if (checkFieldExistance(fieldName)) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
