[jboss-cvs] JBossAS SVN: r110978 - projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2011-03-21 09:52:31 -0400 (Mon, 21 Mar 2011)
New Revision: 110978

Modified:
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkManagerImpl.java
Log:
[JBJCA-531] Guard work completion exception

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkManagerImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkManagerImpl.java	2011-03-21 04:23:15 UTC (rev 110977)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkManagerImpl.java	2011-03-21 13:52:31 UTC (rev 110978)
@@ -312,7 +312,8 @@
             throw exception;
          }
 
-         checkWorkCompletionException(wrapper);
+         if (wrapper != null)
+            checkWorkCompletionException(wrapper);
       }
    }
    
@@ -412,7 +413,8 @@
             throw exception;
          }
 
-         checkWorkCompletionException(wrapper);
+         if (wrapper != null)
+            checkWorkCompletionException(wrapper);
       }
 
       return WorkManager.UNKNOWN;
@@ -506,7 +508,8 @@
             throw exception;
          }
 
-         checkWorkCompletionException(wrapper);
+         if (wrapper != null)
+            checkWorkCompletionException(wrapper);
       }
    }