diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-20 08:19:26 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-20 08:19:26 +0000 |
| commit | a6af3cc8e4646f93fe252302b59aeef00b981c96 (patch) | |
| tree | 1a82369ae29a8f109391500502b5ff6e91932103 /bridges | |
| parent | c1f765df8b5e46d2bf1c8873c500286983f6a6c5 (diff) | |
INTEGRATION: CWS sb21 (1.3.2); FILE MERGED
2004/08/04 14:34:27 sb 1.3.2.1: #i32281# Use 127.0.0.1 instead of localhost to work around IPv4 vs. IPv6 problems between Java and osl.
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/test/java_uno/nativethreadpool/Relay.java | 7 | ||||
| -rw-r--r-- | bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/bridges/test/java_uno/nativethreadpool/Relay.java b/bridges/test/java_uno/nativethreadpool/Relay.java index 6b610f4e2900..b9ba48368319 100644 --- a/bridges/test/java_uno/nativethreadpool/Relay.java +++ b/bridges/test/java_uno/nativethreadpool/Relay.java @@ -2,9 +2,9 @@ * * $RCSfile: Relay.java,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-07-23 14:52:05 $ + * last change: $Author: rt $ $Date: 2004-08-20 09:19:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,9 +104,10 @@ public final class Relay implements XRelay, XSource { new Thread() { public void run() { try { + // Use "127.0.0.1" instead of "localhost", see #i32281#: factory.createBridge( "", "urp", - acceptor.accept("socket,host=localhost,port=3831"), + acceptor.accept("socket,host=127.0.0.1,port=3831"), new XInstanceProvider() { public Object getInstance(String instanceName) { return Relay.this; diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx index c4272dc06aa9..b3f1b5759f1c 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx @@ -2,9 +2,9 @@ * * $RCSfile: testnativethreadpoolserver.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-07-23 14:52:45 $ + * last change: $Author: rt $ $Date: 2004-08-20 09:19:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,11 +113,12 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) { } css::uno::Reference< test::javauno::nativethreadpool::XSource > source; try { + // Use "127.0.0.1" instead of "localhost", see #i32281#: source = css::uno::Reference< test::javauno::nativethreadpool::XSource >( css::bridge::UnoUrlResolver::create(context)->resolve( rtl::OUString::createFromAscii( - "uno:socket,host=localhost,port=3831;urp;test")), + "uno:socket,host=127.0.0.1,port=3831;urp;test")), css::uno::UNO_QUERY_THROW); } catch (css::connection::NoConnectException & e) { throw css::lang::WrappedTargetRuntimeException( |