[MMBASE CVS] src/org/mmbase/bridge/implementation BasicTransaction.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory james.mmbase.org:/tmp/cvs-serv10295

Modified Files:
      Tag: MMBase-1_8
        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.25.2.7
retrieving revision 1.25.2.8
diff -u -b -r1.25.2.7 -r1.25.2.8
--- BasicTransaction.java       9 Jan 2008 10:58:04 -0000       1.25.2.7
+++ BasicTransaction.java       1 Apr 2008 14:46:07 -0000       1.25.2.8
@@ -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.7 2008/01/09 10:58:04 michiel 
Exp $
+ * @version $Id: BasicTransaction.java,v 1.25.2.8 2008/04/01 14:46:07 michiel 
Exp $
  */
 public class BasicTransaction extends BasicCloud implements Transaction {
 
@@ -116,6 +116,9 @@
         return true;
     }
 
+
+
+
     public synchronized void cancel() {
         if (canceled) {
             throw new BridgeException("Cannot cancel transaction'" + name + "' 
(" + transactionContext +"), it was already canceled.");
@@ -232,6 +235,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()
@@ -245,6 +254,7 @@
         }
     }
 
+
     private void readObject(ObjectInputStream in) throws IOException, 
ClassNotFoundException {
         _readObject(in);
         transactionContext = (String) in.readObject();
@@ -266,9 +276,14 @@
 
     public String toString() {
         UserContext uc = getUser();
-        return  "BasicTransaction '" + getName() + "' of " + (uc != null ? 
uc.getIdentifier() : "NO USER YET") + " @" + Integer.toHexString(hashCode());
+        return  "BasicTransaction '" + getName() + "' of " + 
parentCloud.toString();
     }
 
+    /*
+    public Cloud getNonTransactionalCloud() {
+        return parentCloud.getNonTransactionalCloud();
+    }
+    */
 
 }
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs