Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2015-11-27 16:19:46 -0500
committerEugene Tarassov2015-11-27 16:19:46 -0500
commit025c9108ff4165bc46ecbf4e523625c03288cdab (patch)
tree326cba689480ead4172af0751c5f65d9c941d1c2
parentdabedd5fad7a418027b532c64a984b96f9efd4b5 (diff)
downloadorg.eclipse.tcf-025c9108ff4165bc46ecbf4e523625c03288cdab.tar.gz
org.eclipse.tcf-025c9108ff4165bc46ecbf4e523625c03288cdab.tar.xz
org.eclipse.tcf-025c9108ff4165bc46ecbf4e523625c03288cdab.zip
Bug 483177 - When a ChannelTCP has been reset it is attempted to stop the channel1.4_WR_20151211_4.5.0
-rw-r--r--plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/core/ChannelTCP.java10
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();
}
}

Back to the top