geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r984373 - in /geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager: CommitTask.java TransactionImpl.java
Date Wed, 11 Aug 2010 11:26:03 GMT
Author: kevan
Date: Wed Aug 11 11:26:03 2010
New Revision: 984373

URL: http://svn.apache.org/viewvc?rev=984373&view=rev
Log:
GERONIMO-5152 fix some java 5 compile issues

Modified:
    geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java
    geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java

Modified: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java?rev=984373&r1=984372&r2=984373&view=diff
==============================================================================
--- geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java
(original)
+++ geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java
Wed Aug 11 11:26:03 2010
@@ -58,7 +58,6 @@ public class CommitTask implements Runna
         this.txLog = txLog;
     }
 
-    @Override
     public void run() {
         synchronized (this) {
             status = Status.STATUS_COMMITTING;

Modified: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java?rev=984373&r1=984372&r2=984373&view=diff
==============================================================================
--- geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
(original)
+++ geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
Wed Aug 11 11:26:03 2010
@@ -711,7 +711,7 @@ public class TransactionImpl implements 
                         || e.errorCode == XAException.XAER_NOTA) {
                     // Per XA spec, XAException.XAER_RMERR from commit means An error occurred
in 
                     // committing the work performed on behalf of the transaction branch

-                    // and the branchÕs work has been rolled back. 
+                    // and the branches work has been rolled back. 
                     // XAException.XAER_NOTA:  ssume the DB took a unilateral rollback decision
and forgot the transaction
                     log.info("Transaction has been rolled back");
                     cause = e;



Mime
View raw message