geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: rev 55101 - geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log
Date Tue, 19 Oct 2004 21:34:46 GMT
Author: djencks
Date: Tue Oct 19 14:34:46 2004
New Revision: 55101

Modified:
   geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
Log:
reverse premature commit

Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
(original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
Tue Oct 19 14:34:46 2004
@@ -264,14 +264,14 @@
 
     public void commit(Xid xid, Object logMark) throws LogException {
         //the data is theoretically unnecessary but is included to help with debugging and
because HOWL currently requires it.
-//        byte[][] data = new byte[4][];
-//        data[0] = new byte[]{COMMIT};
-//        data[1] = intToBytes(xid.getFormatId());
-//        data[2] = xid.getGlobalTransactionId();
-//        data[3] = xid.getBranchQualifier();
+        byte[][] data = new byte[4][];
+        data[0] = new byte[]{COMMIT};
+        data[1] = intToBytes(xid.getFormatId());
+        data[2] = xid.getGlobalTransactionId();
+        data[3] = xid.getBranchQualifier();
         try {
-//            logger.putDone(data, (XACommittingTx) logMark);
-            logger.putDone(null, (XACommittingTx) logMark);
+            logger.putDone(data, (XACommittingTx) logMark);
+//            logger.putDone(null, (XACommittingTx) logMark);
         } catch (LogClosedException e) {
             throw (IllegalStateException) new IllegalStateException().initCause(e);
         } catch (LogRecordSizeException e) {
@@ -287,14 +287,14 @@
 
     public void rollback(Xid xid, Object logMark) throws LogException {
         //the data is theoretically unnecessary but is included to help with debugging and
because HOWL currently requires it.
-//        byte[][] data = new byte[4][];
-//        data[0] = new byte[]{ROLLBACK};
-//        data[1] = intToBytes(xid.getFormatId());
-//        data[2] = xid.getGlobalTransactionId();
-//        data[3] = xid.getBranchQualifier();
+        byte[][] data = new byte[4][];
+        data[0] = new byte[]{ROLLBACK};
+        data[1] = intToBytes(xid.getFormatId());
+        data[2] = xid.getGlobalTransactionId();
+        data[3] = xid.getBranchQualifier();
         try {
-//            logger.putDone(data, (XACommittingTx) logMark);
-            logger.putDone(null, (XACommittingTx) logMark);
+            logger.putDone(data, (XACommittingTx) logMark);
+//            logger.putDone(null, (XACommittingTx) logMark);
         } catch (LogClosedException e) {
             throw (IllegalStateException) new IllegalStateException().initCause(e);
         } catch (LogRecordSizeException e) {

Mime
View raw message