INTEGRATION: CWS sb21 (1.4.2); FILE MERGED

2004/08/05 09:25:42 sb 1.4.2.1: #i29084# Ensure proper termination (the TestBed.Server non-deamon thread stays within its endless accept loop); and use 127.0.0.1 instead of localhost to work around IPv4 vs. IPv6 problems between Java and osl.

1 files changed, 9 insertions, 7 deletions

diff --git a/bridges/test/java_uno/equals/TestEquals.java b/bridges/test/java_uno/equals/TestEquals.java
index a87db71fd84a..3938259e64e4 100644
--- a/bridges/test/java_uno/equals/TestEquals.java
+++ b/bridges/test/java_uno/equals/TestEquals.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TestEquals.java,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2004-07-23 14:50:40 $
+ *  last change: $Author: rt $ $Date: 2004-08-20 09:18:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,10 +97,11 @@ public final class TestEquals {
     // args[1] must be a file system path to a services.rdb
     public static void main(String[] args) throws Exception {
         TestBed t = new TestBed();
-        System.out.println(
-            "success? "
-            + t.execute(new Provider(t, toFileUrl(args[0]), toFileUrl(args[1])),
-                        true, Client.class, 0));
+        boolean success = t.execute(
+            new Provider(t, toFileUrl(args[0]), toFileUrl(args[1])), true,
+            Client.class, 0);
+        System.out.println("success? " + success);
+        System.exit(success ? 0 : 1);
     }
 
     private static String toFileUrl(String path) throws MalformedURLException {
@@ -967,8 +968,9 @@ public final class TestEquals {
             new MethodTypeInfo("notifyAccepting", 0, TypeInfo.ONEWAY) };
     }
 
+    // Use "127.0.0.1" instead of "localhost", see #i32281#:
     private static final String CONNECTION_DESCRIPTION
-    = "socket,host=localhost,port=12346";
+    = "socket,host=127.0.0.1,port=12346";
     private static final String PROTOCOL_DESCRIPTION = "urp";
 
     private static final String INSTANCE1 = "instance1";