From 4dc3b58d0e5913c6cc9ba74a8c556cc2c170e6c9 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Fri, 16 Dec 2011 14:14:49 +0000
Subject: [PATCH] Add a sanity check on client-side incoming messages.
SVN: 24019
---
.../cisd/common/serviceconversation/ClientMessenger.java | 7 +++++++
1 file changed, 7 insertions(+)
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 1d4822467af..ad27c3a724a 100644
--- a/common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientMessenger.java
+++ b/common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientMessenger.java
@@ -63,6 +63,13 @@ public class ClientMessenger implements IClientMessenger
{
public void send(ServiceMessage message)
{
+ if (serviceConversationId.equals(message.getConversationId()))
+ {
+ throw new IllegalArgumentException(
+ "Attempt to put in a message for conversation "
+ + message.getConversationId()
+ + " into queue for conversation " + serviceConversationId);
+ }
if (message.getMessageIdx() <= messageIdxLastSeen)
{
return;
--
GitLab