diff --git a/src/main/java/org/jboss/ejb/protocol/remote/EJBClientChannel.java b/src/main/java/org/jboss/ejb/protocol/remote/EJBClientChannel.java index cdc8b3fd9..68461164e 100644 --- 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();