summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2007-01-26 03:25:51 +0000
committerMark Spruiell <mes@zeroc.com>2007-01-26 03:25:51 +0000
commit45fcc45c66f1213b0a44653e80314355f84f4aed (patch)
tree6300f4706b6f1c0496c44a71642379338bd8b01a /java/src
parentminor edits (diff)
downloadice-45fcc45c66f1213b0a44653e80314355f84f4aed.tar.bz2
ice-45fcc45c66f1213b0a44653e80314355f84f4aed.tar.xz
ice-45fcc45c66f1213b0a44653e80314355f84f4aed.zip
fixing blocking issue
Diffstat (limited to 'java/src')
-rw-r--r--java/src/IceInternal/TcpAcceptor.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java
index 5f2a624b50c..b34f11e7505 100644
--- a/java/src/IceInternal/TcpAcceptor.java
+++ b/java/src/IceInternal/TcpAcceptor.java
@@ -139,6 +139,7 @@ class TcpAcceptor implements Acceptor
}
}
+ Network.setBlock(fd, false);
try
{
java.net.Socket socket = fd.socket();
@@ -152,11 +153,6 @@ class TcpAcceptor implements Acceptor
throw se;
}
- if(!_instance.threadPerConnection())
- {
- Network.setBlock(fd, false);
- }
-
if(_traceLevels.network >= 1)
{
String s = "accepted tcp connection\n" + Network.fdToString(fd);