From ff81abf2152309dc262478b34c0d54d0191cc336 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Sat, 17 Dec 2011 19:52:42 +0000
Subject: [PATCH] Set the callable name.
SVN: 24032
---
.../server/ServiceConversationServer.java | 13 ++++++-------
.../ServiceConversationTest.java | 2 +-
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/serviceconversation/server/ServiceConversationServer.java b/common/source/java/ch/systemsx/cisd/common/serviceconversation/server/ServiceConversationServer.java
index 636fab0a38e..16b0c04d8d8 100644
--- a/common/source/java/ch/systemsx/cisd/common/serviceconversation/server/ServiceConversationServer.java
+++ b/common/source/java/ch/systemsx/cisd/common/serviceconversation/server/ServiceConversationServer.java
@@ -29,7 +29,7 @@ import ch.systemsx.cisd.base.exceptions.InterruptedExceptionUnchecked;
import ch.systemsx.cisd.base.namedthread.NamingThreadPoolExecutor;
import ch.systemsx.cisd.common.concurrent.ConcurrencyUtilities;
import ch.systemsx.cisd.common.concurrent.ITerminableFuture;
-import ch.systemsx.cisd.common.concurrent.TerminableCallable.ICallable;
+import ch.systemsx.cisd.common.concurrent.TerminableCallable.INamedCallable;
import ch.systemsx.cisd.common.concurrent.TerminableCallable.IStoppableExecutor;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
@@ -188,7 +188,7 @@ public class ServiceConversationServer
final ServiceConversationRecord record = new ServiceConversationRecord(messenger);
conversations.put(serviceConversationId, record);
final ITerminableFuture<Void> controller =
- ConcurrencyUtilities.submit(executor, new ICallable<Void>()
+ ConcurrencyUtilities.submit(executor, new INamedCallable<Void>()
{
public Void call(IStoppableExecutor<Void> stoppableExecutor)
throws Exception
@@ -224,11 +224,10 @@ public class ServiceConversationServer
return null;
}
- // TODO: uncomment once we can name an ICallable.
- // public String getCallableName()
- // {
- // return conversationId + " (" + typeId + ")";
- // }
+ public String getCallableName()
+ {
+ return serviceConversationId + " (" + typeId + ")";
+ }
});
record.setController(controller);
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/serviceconversation/ServiceConversationTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/serviceconversation/ServiceConversationTest.java
index 3974928f925..c22599ef5a9 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/serviceconversation/ServiceConversationTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/serviceconversation/ServiceConversationTest.java
@@ -177,9 +177,9 @@ public class ServiceConversationTest
{
try
{
+ System.err.println(Thread.currentThread().getName());
while (true)
{
- System.err.println(Thread.currentThread().getName());
messenger.send(messenger.receive(String.class));
}
} catch (RuntimeException ex)
--
GitLab