jurt/com/sun/star/lib/connections/socket/socketAcceptor.java | 5 ++++-
jurt/com/sun/star/lib/connections/socket/socketConnector.java | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 9ffdcc76858bc01150727345de4dfd0ef40ed8c0
Author: Noel Grandin <n...@peralex.com>
Date: Thu Jul 30 15:38:41 2015 +0200
fix use of TCP_NODELAY for localhost URP connections
we implemented this logic in the C++ URP code a while back, but the Java
code was not correctly updated.
Change-Id: I377d7150f1adb69d6f86d9b4f3406163aaf85aea
Reviewed-on: https://gerrit.libreoffice.org/17427
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
b/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
index 022f891..da33625 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 fc44639..c169b59 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) {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
