Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory james.mmbase.org:/tmp/cvs-serv2758
Modified Files:
BasicNode.java
Log Message:
To fix MMB-1794 correctly, we need to know when which node is commited
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/implementation
See also: http://www.mmbase.org/jira/browse/MMB-1794
Index: BasicNode.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/BasicNode.java,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -b -r1.233 -r1.234
--- BasicNode.java 22 Dec 2008 17:21:19 -0000 1.233
+++ BasicNode.java 23 Mar 2009 17:43:20 -0000 1.234
@@ -31,7 +31,7 @@
* @author Rob Vermeulen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: BasicNode.java,v 1.233 2008/12/22 17:21:19 michiel Exp $
+ * @version $Id: BasicNode.java,v 1.234 2009/03/23 17:43:20 michiel Exp $
* @see org.mmbase.bridge.Node
* @see org.mmbase.module.core.MMObjectNode
*/
@@ -492,6 +492,9 @@
}
checkCommit();
+ Object prev = getCloud().getProperty(CLOUD_COMMITNODE_KEY);
+ try {
+ getCloud().setProperty(CLOUD_COMMITNODE_KEY, new
Integer(getNumber())); // Validation code want to know that we are commiting
right now.
Collection<String> errors = validate();
if (errors.size() > 0) {
String mes = "node " + getNumber() + noderef.getChanged() + ",
builder '" + nodeManager.getName() + "' " + errors.toString();
@@ -500,6 +503,10 @@
throw new IllegalArgumentException(mes);
}
}
+ } finally {
+ getCloud().setProperty(CLOUD_COMMITNODE_KEY, prev);
+ }
+
processCommit();
if (log.isDebugEnabled()) {
log.debug("committing " + noderef.getChanged());
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
