From f22da1c87118c0d5c8f86668b578ad9c122a852a Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Mon, 10 Mar 2008 14:53:26 +0000
Subject: [PATCH] [222003] client remains connected after server terminates

---
 .../eclipse/dstore/internal/core/util/Receiver.java    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Receiver.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Receiver.java
index 85e4bacfb58..169506f2420 100644
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Receiver.java
+++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Receiver.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David McKnight  (IBM)   [220123][dstore] Configurable timeout on irresponsiveness
+ * David McKnight  (IBM)   [222003] Client remains connected after server terminates
  *******************************************************************************/
 
 package org.eclipse.dstore.internal.core.util;
@@ -112,6 +113,15 @@ public abstract class Receiver extends Thread implements IDataStorePreferenceLis
 			{
 				handleInput();
 			}
+			
+			if (_canExit){
+				// is this an unexpected exit?
+				if (_dataStore.isConnected()){
+					// server exited without client exit
+					Exception e = new Exception("Server terminated unexpectedly");
+					handleError(e);
+				}
+			}
 		}
 		catch (Exception e)
 		{