### Eclipse Workspace Patch 1.0
#P org.eclipse.dstore.core
Index: src/org/eclipse/dstore/core/server/ServerReceiver.java
===================================================================
RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java,v
retrieving revision 1.13
diff -u -r1.13 ServerReceiver.java
--- src/org/eclipse/dstore/core/server/ServerReceiver.java	15 Dec 2010 16:38:24 -0000	1.13
+++ src/org/eclipse/dstore/core/server/ServerReceiver.java	15 Dec 2010 17:50:18 -0000
@@ -129,7 +129,7 @@
 	 */
 	public void resetKeepAliveRequest(long timeout) 
 	{
-		xmlParser().resetKeepAliveRequest(timeout, socket());
+		getKeepaliveHandler().resetKeepAliveRequest(timeout, socket());
 	}
 
 }
Index: src/org/eclipse/dstore/core/util/IKeepAliveHandler.java
===================================================================
RCS file: src/org/eclipse/dstore/core/util/IKeepAliveHandler.java
diff -N src/org/eclipse/dstore/core/util/IKeepAliveHandler.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/dstore/core/util/IKeepAliveHandler.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,19 @@
+package org.eclipse.dstore.core.util;
+
+import java.net.Socket;
+
+/**
+ * @since 3.3
+ */
+public interface IKeepAliveHandler {
+
+	/**
+	 * Interrupt the current KeepAliveRequest thread and restart 
+	 * the KeepAliveRequest thread with the specified timeout
+	 *
+	 * @param timeout when the KeepAliveRequest thread is expired
+	 * @param socket to wait for
+	 * 
+	 */
+	public void resetKeepAliveRequest(long timeout, Socket socket);
+}
Index: src/org/eclipse/dstore/core/util/Receiver.java
===================================================================
RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Receiver.java,v
retrieving revision 1.11
diff -u -r1.11 Receiver.java
--- src/org/eclipse/dstore/core/util/Receiver.java	15 Dec 2010 16:38:25 -0000	1.11
+++ src/org/eclipse/dstore/core/util/Receiver.java	15 Dec 2010 17:50:19 -0000
@@ -187,11 +187,11 @@
 	}
 	
 	/**
-	 * Returns the associated xml parser
-	 * @return the xml parser
+	 * Returns the associated keepalive handler
+	 * @return the keepalive handler (in this case, that's the xml parser)
 	 * @since 3.3
 	 */
-	public XMLparser xmlParser()
+	public IKeepAliveHandler getKeepaliveHandler()
 	{
 		return _xmlParser;
 	}
Index: src/org/eclipse/dstore/internal/core/util/XMLparser.java
===================================================================
RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java,v
retrieving revision 1.18
diff -u -r1.18 XMLparser.java
--- src/org/eclipse/dstore/internal/core/util/XMLparser.java	15 Dec 2010 16:38:25 -0000	1.18
+++ src/org/eclipse/dstore/internal/core/util/XMLparser.java	15 Dec 2010 17:50:19 -0000
@@ -38,6 +38,7 @@
 import org.eclipse.dstore.core.model.DataElement;
 import org.eclipse.dstore.core.model.DataStore;
 import org.eclipse.dstore.core.model.DataStoreResources;
+import org.eclipse.dstore.core.util.IKeepAliveHandler;
 
 /**
  * <p>
@@ -56,7 +57,7 @@
  * sent the the current DataStore <code>ByteStreamHandler</code> to be saved on disk.
  * </p>
  */
-public class XMLparser
+public class XMLparser implements IKeepAliveHandler
 {
 	public static final String KEEPALIVE_RESPONSE_TIMEOUT_PREFERENCE = "DSTORE_KEEPALIVE_RESPONSE_TIMEOUT"; //$NON-NLS-1$
 	public static final String IO_SOCKET_READ_TIMEOUT_PREFERENCE = "DSTORE_IO_SOCKET_READ_TIMEOUT"; //$NON-NLS-1$