geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r985785 - /geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RecoverTask.java
Date Mon, 16 Aug 2010 02:27:45 GMT
Author: kevan
Date: Mon Aug 16 02:27:44 2010
New Revision: 985785

URL: http://svn.apache.org/viewvc?rev=985785&view=rev
Log:
GERONIMO-5530 Only recover if there's a non-null XAResource

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

Modified: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RecoverTask.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/RecoverTask.java?rev=985785&r1=985784&r2=985785&view=diff
==============================================================================
--- geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RecoverTask.java
(original)
+++ geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RecoverTask.java
Mon Aug 16 02:27:44 2010
@@ -47,6 +47,9 @@ public class RecoverTask implements Runn
     public void run() {
         try {
             NamedXAResource namedXAResource = namedXAResourceFactory.getNamedXAResource();
+            if (namedXAResource == null) {
+                return;
+            }
             try {
                 recovery.recoverResourceManager(namedXAResource);
             } finally {



Mime
View raw message