Bug 483177 - When a ChannelTCP has been reset it is attempted to stop the channel1.4_WR_20151211_4.5.0

1 files changed, 7 insertions, 3 deletions

diff --git a/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/core/ChannelTCP.java b/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/core/ChannelTCP.java
index 8402fafcc..689aceb7b 100644
--- a/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/core/ChannelTCP.java
+++ b/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/core/ChannelTCP.java
@@ -96,11 +96,11 @@ public class ChannelTCP extends StreamChannel {
         socket.setReuseAddress(on);
     }
 
-    public void setReceiveBufferSize(int size) throws SocketException{
+    public void setReceiveBufferSize(int size) throws SocketException {
         socket.setReceiveBufferSize(size);
     }
 
-    public void setSendBufferSize(int size) throws SocketException{
+    public void setSendBufferSize(int size) throws SocketException {
         socket.setSendBufferSize(size);
     }
 
@@ -197,7 +197,11 @@ public class ChannelTCP extends StreamChannel {
         closed = true;
         if (started) {
             socket.close();
-            out.close();
+            /* 
+             * We should not write anything to the stream here, just close it.
+             * So, don't call out.close(), because it calls out.flush().
+             * The socket output stream is already closed by socket.close().
+             */
             inp.close();
         }
     }