Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory james.mmbase.org:/tmp/cvs-serv26618
Modified Files:
Tag: MMBase-1_8
BasicTransaction.java
Log Message:
temporary rolled back last changed, because it gave some unexpected problems
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/implementation
Index: BasicTransaction.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/BasicTransaction.java,v
retrieving revision 1.25.2.13
retrieving revision 1.25.2.14
diff -u -b -r1.25.2.13 -r1.25.2.14
--- BasicTransaction.java 4 Nov 2008 17:29:45 -0000 1.25.2.13
+++ BasicTransaction.java 18 Nov 2008 23:22:21 -0000 1.25.2.14
@@ -23,7 +23,7 @@
* which means that chanegs are committed only if you commit the transaction
itself.
* This mechanism allows you to rollback changes if something goes wrong.
* @author Pierre van Rooden
- * @version $Id: BasicTransaction.java,v 1.25.2.13 2008/11/04 17:29:45 michiel
Exp $
+ * @version $Id: BasicTransaction.java,v 1.25.2.14 2008/11/18 23:22:21 michiel
Exp $
*/
public class BasicTransaction extends BasicCloud implements Transaction {
@@ -102,21 +102,11 @@
Iterator i = col.iterator();
while (i.hasNext()) {
MMObjectNode n = (MMObjectNode) i.next();
-
- if (n == null) {
- log.warn("Found null in transaction");
- continue;
- }
+ if
(!TransactionManager.EXISTS_NOLONGER.equals(n.getStringValue("_exists"))) {
Node node = parentCloud.makeNode(n, "" + n.getNumber());
- if (! node.isChanged() && ! node.isNew()) {
- continue;
- }
- if
(TransactionManager.EXISTS_NOLONGER.equals(n.getStringValue("_exists"))) {
- continue;
- }
-
node.commit();
}
+ }
} catch (TransactionManagerException e) {
// do we drop the transaction here or delete the trans context?
// return false;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
