diff options
| -rw-r--r-- | jurt/com/sun/star/lib/connections/socket/socketAcceptor.java | 5 | ||||
| -rw-r--r-- | jurt/com/sun/star/lib/connections/socket/socketConnector.java | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java b/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java index 022f89142c75..da33625e498d 100644 --- a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java +++ b/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java @@ -152,9 +152,12 @@ public final class socketAcceptor implements XAcceptor { } // we enable tcpNoDelay for loopback connections because // it can make a significant speed difference on linux boxes. - if (tcpNoDelay != null || ((InetSocketAddress)socket.getRemoteSocketAddress()).getAddress().isLoopbackAddress()) { + if (tcpNoDelay != null) { socket.setTcpNoDelay(tcpNoDelay.booleanValue()); } + else if (((InetSocketAddress)socket.getRemoteSocketAddress()).getAddress().isLoopbackAddress()) { + socket.setTcpNoDelay(true); + } return new SocketConnection(acceptingDescription, socket); } catch(IOException e) { diff --git a/jurt/com/sun/star/lib/connections/socket/socketConnector.java b/jurt/com/sun/star/lib/connections/socket/socketConnector.java index fc44639a5feb..c169b59a6aeb 100644 --- a/jurt/com/sun/star/lib/connections/socket/socketConnector.java +++ b/jurt/com/sun/star/lib/connections/socket/socketConnector.java @@ -146,8 +146,10 @@ public final class socketConnector implements XConnector { try { // we enable tcpNoDelay for loopback connections because // it can make a significant speed difference on linux boxes. - if (desc.getTcpNoDelay() != null || isLoopbackAddress) + if (desc.getTcpNoDelay() != null) socket.setTcpNoDelay(desc.getTcpNoDelay().booleanValue()); + else if (isLoopbackAddress) + socket.setTcpNoDelay(true); con = new SocketConnection(connectionDescription, socket); } catch (IOException e) { |