Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory james.mmbase.org:/tmp/cvs-serv24321
Modified Files:
Tag: MMBase-1_8
BasicRelation.java
Log Message:
MMB-1790
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/implementation
See also: http://www.mmbase.org/jira/browse/MMB-1790
Index: BasicRelation.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/BasicRelation.java,v
retrieving revision 1.40
retrieving revision 1.40.2.1
diff -u -b -r1.40 -r1.40.2.1
--- BasicRelation.java 24 Jan 2006 12:29:27 -0000 1.40
+++ BasicRelation.java 2 Mar 2009 14:22:56 -0000 1.40.2.1
@@ -20,7 +20,7 @@
*
* @author Rob Vermeulen
* @author Pierre van Rooden
- * @version $Id: BasicRelation.java,v 1.40 2006/01/24 12:29:27 michiel Exp $
+ * @version $Id: BasicRelation.java,v 1.40.2.1 2009/03/02 14:22:56 michiel Exp
$
*/
public class BasicRelation extends BasicNode implements Relation {
private static final Logger log =
Logging.getLoggerInstance(BasicRelation.class);
@@ -96,13 +96,14 @@
if (node.getCloud() != cloud) {
throw new BridgeException("Source and relation are not in the same
transaction or from different clouds.");
}
+ edit(ACTION_EDIT);
relationChanged = true;
- int source=node.getIntValue("number");
- if (source==-1) {
+ int source = node.getIntValue("number");
+ if (source == -1) {
// set a temporary field, transactionmanager resolves this
getNode().setValue("_snumber",
node.getValue(MMObjectBuilder.TMP_FIELD_NUMBER));
} else {
- getNode().setValue("snumber",source);
+ getNode().setValue("snumber", source);
}
snum = node.getNumber();
sourceNodeType = node.getIntValue("otype");
@@ -112,9 +113,10 @@
if (node.getCloud() != cloud) {
throw new BridgeException("Destination and relation are not in the
same transaction or from different clouds.");
}
+ edit(ACTION_EDIT);
relationChanged = true;
- int dest=node.getIntValue("number");
- if (dest==-1) {
+ int dest = node.getIntValue("number");
+ if (dest == -1) {
// set a temporary field, transactionmanager resolves this
getNode().setValue("_dnumber",
node.getValue(MMObjectBuilder.TMP_FIELD_NUMBER));
} else {
@@ -213,6 +215,7 @@
}
}
}
+ log.debug("Committing " + getChanged());
super.commit();
if (!(cloud instanceof Transaction)) {
snum = getNode().getIntValue("snumber");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
