Attachment 122827 Details for Bug 258993 – backported patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] backported patch

patch.txt (text/plain), 1.76 KB, created by David McKnight

on 2009-01-16 12:36:38 EST

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2009-01-16 12:36:38 EST

Size: 1.76 KB

patch

obsolete

>### 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.9
>diff -u -r1.9 ServerReceiver.java
>--- src/org/eclipse/dstore/core/server/ServerReceiver.java	4 Jun 2008 10:50:16 -0000	1.9
>+++ src/org/eclipse/dstore/core/server/ServerReceiver.java	16 Jan 2009 17:36:17 -0000
>@@ -15,10 +15,13 @@
>  * David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
>  * Noriaki Takatsu  (IBM) - [227905] prevent double invocations of finished in ConncetionEstablisher
>  * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
>+ * Noriaki Takatsu  (IBM) - [257666] [multithread] TCP/IP socket connection is not closed
>+ * David McKnight   (IBM) - [257666] modified original patch to simplify
>  *******************************************************************************/
> 
> package org.eclipse.dstore.core.server;
> 
>+import java.io.IOException;
> import java.net.Socket;
> 
> import org.eclipse.dstore.core.model.DataElement;
>@@ -82,6 +85,13 @@
> 		_dataStore.setConnected(false);
> 	    super.finish();
> 	    _connection.finished(this);
>+	    try
>+	    {
>+	    	socket().close();
>+	    }
>+	    catch (IOException e){
>+	    	System.out.println(e);
>+	    }
> 	}
> 
> 	/**
>@@ -93,6 +103,13 @@
> 		e.printStackTrace();
> 		System.out.println(e);
> 		_connection.finished(this);
>+		try
>+	    {
>+	    	socket().close();
>+	    }
>+	    catch (IOException IOe){
>+	    	System.out.println(IOe);
>+	    }
> 	}
> 
> }

Actions: View | Diff

Attachments on bug 258993: 122827