Merge pull request #285 from stuartwdouglas/result-prod

EJBCLIENT-243 Make sure only the first result is taken into account.
wildfly · Jul 5, 2017 · 211201a · 211201a
2 parents 977dcf6 + 91b6216
commit 211201a
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/main/java/org/jboss/ejb/client/EJBClientInvocationContext.java b/src/main/java/org/jboss/ejb/client/EJBClientInvocationContext.java
@@ -637,7 +637,7 @@ public void discardResult() throws IllegalStateException {
     void resultReady(EJBReceiverInvocationContext.ResultProducer resultProducer) {
         Assert.checkNotNullParam("resultProducer", resultProducer);
         synchronized (lock) {
-            if (state.isWaiting()) {
+            if (state.isWaiting() && this.resultProducer == null) {
                 this.resultProducer = resultProducer;
                 if (state == State.WAITING) {
                     transition(State.READY);
@@ -649,7 +649,6 @@ void resultReady(EJBReceiverInvocationContext.ResultProducer resultProducer) {
         }
         // for whatever reason, we don't care
         resultProducer.discardResult();
-        return;
     }
 
     /**