Merge pull request #242 from kurobako/EJBCLIENT-203

EJBCLIENT-203 EJBReceiverInvocationContext.ResultProducer not putting response contextData on InvocationContext
wildfly · Apr 3, 2017 · 47bc64e · 47bc64e
2 parents fcf7533 + 8a23c74
commit 47bc64e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/org/jboss/ejb/protocol/remote/EJBClientChannel.java b/src/main/java/org/jboss/ejb/protocol/remote/EJBClientChannel.java
@@ -1264,9 +1264,11 @@ public Object getResult() throws Exception {
                         String key = unmarshaller.readObject(String.class);
                         if (key.equals(Affinity.WEAK_AFFINITY_CONTEXT_KEY)) {
                             receiverInvocationContext.getClientInvocationContext().putAttachment(AttachmentKeys.WEAK_AFFINITY, unmarshaller.readObject(Affinity.class));
-                        } else {
-                            // discard
+                        } else if (key.equals(EJBClientInvocationContext.PRIVATE_ATTACHMENTS_KEY)) {
+                            // skip
                             unmarshaller.readObject();
+                        } else {
+                            receiverInvocationContext.getClientInvocationContext().getContextData().put(key, unmarshaller.readObject());
                         }
                     }
                     unmarshaller.finish();