commit 0aa5544a7d0e4dae2bc58137cb15b4ab222d8d82
author David Jencks <djencks@apache.org> Sat Sep 25 06:52:04 2010 +0000
committer David Jencks <djencks@apache.org> Sat Sep 25 06:52:04 2010 +0000
tree 81925b8b13e75179ae8bd0d1f213ef83f489803f
parent afcf0cd53f7e80b17d5e72cd29fc3b26c178edd7

This NPE fix never got ported from the 2.2 branch

git-svn-id: https://svn.apache.org/repos/asf/geronimo/components/txmanager/trunk@1001148 13f79535-47bb-0310-9956-ffa450edef68

geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RecoverTask.java

diff --git a/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RecoverTask.java b/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RecoverTask.java
index f55cac0..65126b7 100644
--- a/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RecoverTask.java
+++ b/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RecoverTask.java
@@ -47,10 +47,12 @@
     public void run() {
         try {
             NamedXAResource namedXAResource = namedXAResourceFactory.getNamedXAResource();
-            try {
-                recovery.recoverResourceManager(namedXAResource);
-            } finally {
-                namedXAResourceFactory.returnNamedXAResource(namedXAResource);
+            if (namedXAResource != null) {
+                try {
+                    recovery.recoverResourceManager(namedXAResource);
+                } finally {
+                    namedXAResourceFactory.returnNamedXAResource(namedXAResource);
+                }
             }
             return;
         } catch (XAException e) {