summaryrefslogtreecommitdiff
path: root/qpid/java
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
commit86e4234b3de0f4b36f40d9be909169880600e1e3 (patch)
tree9d3f0e6abcc82489109ddfd824eb895f49a92d4c /qpid/java
parent922ff57649c4f93bd90584704e694c8da0ef39f3 (diff)
downloadqpid-python-86e4234b3de0f4b36f40d9be909169880600e1e3.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@687310 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
index d6d1df573c..a1fb0371fd 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
+++ b/qpid/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);