jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1169551 - /jackrabbit/branches/JCR-2936/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java
Date Sun, 11 Sep 2011 22:16:53 GMT
Author: jukka
Date: Sun Sep 11 22:16:52 2011
New Revision: 1169551

URL: http://svn.apache.org/viewvc?rev=1169551&view=rev
Log:
Normalize whitespace

Modified:
    jackrabbit/branches/JCR-2936/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java
  (contents, props changed)

Modified: jackrabbit/branches/JCR-2936/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java?rev=1169551&r1=1169550&r2=1169551&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java
(original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java
Sun Sep 11 22:16:52 2011
@@ -199,11 +199,11 @@ public class TransactionContext extends 
      */
     public synchronized void commit(boolean onePhase) throws XAException {
         if (status == STATUS_ROLLED_BACK) {
-        	if (onePhase && timedOut) {
-        		throw new XAException(XAException.XA_RBTIMEOUT);
-        	} else {
-        		throw new XAException(XAException.XA_HEURRB);
-        	}
+            if (onePhase && timedOut) {
+                throw new XAException(XAException.XA_RBTIMEOUT);
+            } else {
+                throw new XAException(XAException.XA_HEURRB);
+            }
         }
         boolean heuristicCommit = false;
         bindCurrentXid();
@@ -232,20 +232,20 @@ public class TransactionContext extends 
         status = STATUS_COMMITTED;
 
         if (onePhase) {
-        	// cancel the rollback task only in onePhase Transactions
-        	cancel();
+            // cancel the rollback task only in onePhase Transactions
+            cancel();
         }
         cleanCurrentXid();
 
         if (txe != null) {
-        	XAException e = null;
-        	if (heuristicCommit) {
-        		e = new XAException(XAException.XA_HEURMIX);
-        	} else {
-        		e = new XAException(XAException.XA_HEURRB);
-        	}
-    		e.initCause(txe);
-    		throw e;
+            XAException e = null;
+            if (heuristicCommit) {
+                e = new XAException(XAException.XA_HEURMIX);
+            } else {
+                e = new XAException(XAException.XA_HEURRB);
+            }
+            e.initCause(txe);
+            throw e;
         }
     }
 

Propchange: jackrabbit/branches/JCR-2936/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java
            ('svn:keywords' removed)



Mime
View raw message