summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Simon <arnaudsimon@apache.org>2008-08-20 13:06:56 +0000
committerArnaud Simon <arnaudsimon@apache.org>2008-08-20 13:06:56 +0000
commitf7a0ffdb957c34e93150db08d547a3c42e4cc90a (patch)
treeba649622c80c12e57d5a1e31525e7eeaaa7091ad
parent956003ca4f4c9c72755b86536112a247571d576f (diff)
downloadqpid-python-f7a0ffdb957c34e93150db08d547a3c42e4cc90a.tar.gz
qpid-1251: changed close method for closing the underlying socket on windows only.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@687310 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
index d6d1df573c..a1fb0371fd 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
@@ -67,7 +67,14 @@ final class IoReceiver extends Thread
{
try
{
- socket.shutdownInput();
+ if (((String) System.getProperties().get("os.name")).matches("(?i).*windows.*"))
+ {
+ socket.close();
+ }
+ else
+ {
+ socket.shutdownInput();
+ }
if (Thread.currentThread() != this)
{
join(timeout);