From 05df4315e0a5c1751a2016cd02212abce2747bdf Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 16 Dec 2010 14:31:29 +0000 Subject: [PATCH] [289234][multithread][api] Reset and Restart KeepAliveRequestThread --- .../dstore/core/server/ServerReceiver.java | 13 ------------ .../eclipse/dstore/core/util/Receiver.java | 21 +++++++++++-------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java index 61afbca2efe..54b375e3726 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java @@ -119,17 +119,4 @@ public class ServerReceiver extends Receiver System.out.println(IOe); } } - - /** - * Interrupt the current KeepAliveRequest thread and restart - * the KeepAliveRequest thread with the specified timeout - * - * @param timeout when the KeepAliveRequest thread is expired - * @since 3.3 - */ - public void resetKeepAliveRequest(long timeout) - { - xmlParser().resetKeepAliveRequest(timeout, socket()); - } - } diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Receiver.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Receiver.java index 51c43192a59..f276b832154 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Receiver.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Receiver.java @@ -186,15 +186,6 @@ public abstract class Receiver extends SecuredThread implements IDataStorePrefer return _socket; } - /** - * Returns the associated xml parser - * @return the xml parser - * @since 3.3 - */ - public XMLparser xmlParser() - { - return _xmlParser; - } /** * Implemented to provide a means of handling received input @@ -228,4 +219,16 @@ public abstract class Receiver extends SecuredThread implements IDataStorePrefer } } + + /** + * Interrupt the current KeepAliveRequest thread and restart + * the KeepAliveRequest thread with the specified timeout + * + * @param timeout when the KeepAliveRequest thread is expired + * @since 3.3 + */ + public void resetKeepAliveRequest(long timeout) + { + _xmlParser.resetKeepAliveRequest(timeout, socket()); + } }