Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory james.mmbase.org:/tmp/cvs-serv10387
Modified Files:
BasicTransaction.java
Log Message:
MMB-1523
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/implementation
See also: http://www.mmbase.org/jira/browse/MMB-1523
Index: BasicTransaction.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/BasicTransaction.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- BasicTransaction.java 9 Jan 2008 10:56:36 -0000 1.36
+++ BasicTransaction.java 1 Apr 2008 14:47:52 -0000 1.37
@@ -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.36 2008/01/09 10:56:36 michiel Exp $
+ * @version $Id: BasicTransaction.java,v 1.37 2008/04/01 14:47:52 michiel Exp $
*/
public class BasicTransaction extends BasicCloud implements Transaction {
@@ -155,6 +155,8 @@
return true;
}
+
+
public synchronized void cancel() {
if (canceled) {
throw new BridgeException("Cannot cancel transaction'" + name + "'
(" + transactionContext +"), it was already canceled.");
@@ -305,6 +307,12 @@
return value;
}
}
+ public Map getProperties() {
+ Map ret = new HashMap();
+ ret.putAll(parentCloud.getProperties());
+ ret.putAll(super.getProperties());
+ return Collections.unmodifiableMap(ret);
+ }
/**
* @see org.mmbase.bridge.Transaction#getCloudName()
@@ -342,5 +350,11 @@
UserContext uc = getUser();
return "BasicTransaction " + count + "'" + getName() + "' of " + (uc
!= null ? uc.getIdentifier() : "NO USER YET") + " @" +
Integer.toHexString(hashCode());
}
+
+ /*
+ public Cloud getNonTransactionalCloud() {
+ return parentCloud.getNonTransactionalCloud();
+ }
+ */
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
