From 28a9a5b07fb799c7ac56e962685ee5e97baf8c37 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Fri, 16 Dec 2011 11:58:49 +0000
Subject: [PATCH] Ensure that both service Conversation ID and client timeout
 are set when constructing a ClientMessenger.

SVN: 24018
---
 .../cisd/common/serviceconversation/ClientMessenger.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientMessenger.java b/common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientMessenger.java
index 83b08a84e4e..1d4822467af 100644
--- a/common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientMessenger.java
+++ b/common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientMessenger.java
@@ -44,9 +44,11 @@ public class ClientMessenger implements IClientMessenger
 
     private int outgoingMessageIdx;
 
-    public ClientMessenger(String serviceConversationId, ISendingMessenger senderToService)
+    public ClientMessenger(ServiceConversationDTO serviceConversationDTO,
+            ISendingMessenger senderToService)
     {
-        this.serviceConversationId = serviceConversationId;
+        this.serviceConversationId = serviceConversationDTO.getServiceConversationId();
+        this.timeoutMillis = serviceConversationDTO.getClientTimeoutInMillis();
         this.senderToService = senderToService;
     }
 
-- 
GitLab