Merge pull request #7216 from bmaxwell/WFLY-4331_2

wildfly · Mar 6, 2015 · 372849d · 372849d
2 parents c0c1e82 + 84fd498
commit 372849d
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/remote/LocalEjbReceiver.java b/ejb3/src/main/java/org/jboss/as/ejb3/remote/LocalEjbReceiver.java
@@ -30,6 +30,7 @@
 import java.security.PrivilegedExceptionAction;
 import java.util.Collections;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -226,10 +227,18 @@ protected Object runInvocation() throws Exception {
                         setSecurityContextOnAssociation(securityContext);
                         try {
                             Object result = view.invoke(interceptorContext);
+                            // if the result is null, there is no cloning needed
+                            if(result == null) {
+                                return result;
+                            }
                             // WFLY-4331 - clone the result of an async task
-                            if(result instanceof AsyncResult) {
-                                  Object asyncValue = ((AsyncResult)result).get();
-                              return new AsyncResult(LocalEjbReceiver.clone(asyncValue.getClass(), resultCloner, asyncValue, allowPassByReference));
+                            if(result instanceof Future) {
+                                Object asyncValue = ((Future)result).get();
+                                // if the return value is null, there is no cloning needed
+                                if(asyncValue == null) {
+                                    return asyncValue;
+                                }
+                                return new AsyncResult(LocalEjbReceiver.clone(asyncValue.getClass(), resultCloner, asyncValue, allowPassByReference));
                             }
                             return LocalEjbReceiver.clone(result.getClass(), resultCloner, result, allowPassByReference);
                         } catch(ExecutionException e) {