From 9bffed0dfa1fa3a993e6894035417c10cc05f994 Mon Sep 17 00:00:00 2001 From: brinn <brinn> Date: Sun, 18 Dec 2011 11:12:07 +0000 Subject: [PATCH] Should not check for service exception when calling terminate(). SVN: 24049 --- .../serviceconversation/client/ClientMessenger.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/common/source/java/ch/systemsx/cisd/common/serviceconversation/client/ClientMessenger.java b/common/source/java/ch/systemsx/cisd/common/serviceconversation/client/ClientMessenger.java index 1b231ad90f6..97b86447259 100644 --- a/common/source/java/ch/systemsx/cisd/common/serviceconversation/client/ClientMessenger.java +++ b/common/source/java/ch/systemsx/cisd/common/serviceconversation/client/ClientMessenger.java @@ -82,12 +82,6 @@ class ClientMessenger implements IServiceConversation nextOutgoingMessageIndex(), false, message)); } - public void terminate() - { - checkServiceException(); - transportToService.send(ServiceMessage.terminate(serviceConversationId)); - } - private void checkServiceException() throws ServiceExecutionException { if (serviceExceptionSignaled.getAndSet(false)) @@ -107,6 +101,11 @@ class ClientMessenger implements IServiceConversation } } + public void terminate() + { + transportToService.send(ServiceMessage.terminate(serviceConversationId)); + } + public <T extends Serializable> T receive(Class<T> messageClass) { try -- GitLab