Fixed ICE-8132 - Ice/slicing/exceptions failure with UWP/SSL

3 files changed, 126 insertions, 121 deletions

diff --git a/java/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java
index 2039ac2de3c..ecf84786c3d 100644
--- a/java/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java
@@ -234,7 +234,8 @@ public final class AMDTestI implements TestIntf
     {
         try
         {
-            r.knownPreservedAsBase();
+            RelayPrx p = RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+            p.knownPreservedAsBase();
             test(false);
             return null;
         }
@@ -257,7 +258,8 @@ public final class AMDTestI implements TestIntf
     {
         try
         {
-            r.knownPreservedAsKnownPreserved();
+            RelayPrx p = RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+            p.knownPreservedAsKnownPreserved();
             test(false);
             return null;
         }
@@ -308,7 +310,8 @@ public final class AMDTestI implements TestIntf
     {
         try
         {
-            r.unknownPreservedAsBase();
+            RelayPrx p = RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+            p.unknownPreservedAsBase();
             test(false);
             return null;
         }
@@ -331,7 +334,8 @@ public final class AMDTestI implements TestIntf
     {
         try
         {
-            r.unknownPreservedAsKnownPreserved();
+            RelayPrx p = RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+            p.unknownPreservedAsKnownPreserved();
             test(false);
             return null;
         }
diff --git a/java/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java b/java/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java
index 57e8565ce94..8445d06ae74 100644
--- a/java/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java
@@ -649,126 +649,123 @@ public class AllTests
         }
         out.println("ok");
 
-        final String defaultHost = communicator.getProperties().getProperty("Ice.Default.Host");
-        if(defaultHost.equals("127.0.0.1") || defaultHost.equals("::1"))
+        out.print("preserved exceptions... ");
+        out.flush();
         {
-            out.print("preserved exceptions... ");
-            out.flush();
-            {
-                com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints("Relay", "default");
-                RelayPrx relay = RelayPrx.uncheckedCast(adapter.addWithUUID(new RelayI()));
-                adapter.activate();
-
-                try
-                {
-                    test.relayKnownPreservedAsBase(relay);
-                    test(false);
-                }
-                catch(KnownPreservedDerived ex)
-                {
-                    test(ex.b.equals("base"));
-                    test(ex.kp.equals("preserved"));
-                    test(ex.kpd.equals("derived"));
-                }
-                catch(com.zeroc.Ice.OperationNotExistException ex)
-                {
-                }
-                catch(Exception ex)
-                {
-                    test(false);
-                }
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("");
+            RelayPrx relay = RelayPrx.uncheckedCast(adapter.addWithUUID(new RelayI()));
+            adapter.activate();
+            test.ice_getConnection().setAdapter(adapter);
 
-                try
-                {
-                    test.relayKnownPreservedAsKnownPreserved(relay);
-                    test(false);
-                }
-                catch(KnownPreservedDerived ex)
-                {
-                    test(ex.b.equals("base"));
-                    test(ex.kp.equals("preserved"));
-                    test(ex.kpd.equals("derived"));
-                }
-                catch(com.zeroc.Ice.OperationNotExistException ex)
-                {
-                }
-                catch(Exception ex)
-                {
-                    test(false);
-                }
+            try
+            {
+                test.relayKnownPreservedAsBase(relay);
+                test(false);
+            }
+            catch(KnownPreservedDerived ex)
+            {
+                test(ex.b.equals("base"));
+                test(ex.kp.equals("preserved"));
+                test(ex.kpd.equals("derived"));
+            }
+            catch(com.zeroc.Ice.OperationNotExistException ex)
+            {
+            }
+            catch(Exception ex)
+            {
+                test(false);
+            }
 
-                try
-                {
-                    test.relayUnknownPreservedAsBase(relay);
-                    test(false);
-                }
-                catch(Preserved2 ex)
-                {
-                    test(ex.b.equals("base"));
-                    test(ex.kp.equals("preserved"));
-                    test(ex.kpd.equals("derived"));
-                    test(ex.p1.ice_id().equals(PreservedClass.ice_staticId()));
-                    PreservedClass pc = (PreservedClass)ex.p1;
-                    test(pc.bc.equals("bc"));
-                    test(pc.pc.equals("pc"));
-                    test(ex.p2 == ex.p1);
-                }
-                catch(KnownPreservedDerived ex)
-                {
-                    //
-                    // For the 1.0 encoding, the unknown exception is sliced to KnownPreserved.
-                    //
-                    test(test.ice_getEncodingVersion().equals(com.zeroc.Ice.Util.Encoding_1_0));
-                    test(ex.b.equals("base"));
-                    test(ex.kp.equals("preserved"));
-                    test(ex.kpd.equals("derived"));
-                }
-                catch(com.zeroc.Ice.OperationNotExistException ex)
-                {
-                }
-                catch(Exception ex)
-                {
-                    test(false);
-                }
+            try
+            {
+                test.relayKnownPreservedAsKnownPreserved(relay);
+                test(false);
+            }
+            catch(KnownPreservedDerived ex)
+            {
+                test(ex.b.equals("base"));
+                test(ex.kp.equals("preserved"));
+                test(ex.kpd.equals("derived"));
+            }
+            catch(com.zeroc.Ice.OperationNotExistException ex)
+            {
+            }
+            catch(Exception ex)
+            {
+                test(false);
+            }
 
-                try
-                {
-                    test.relayUnknownPreservedAsKnownPreserved(relay);
-                    test(false);
-                }
-                catch(Preserved2 ex)
-                {
-                    test(ex.b.equals("base"));
-                    test(ex.kp.equals("preserved"));
-                    test(ex.kpd.equals("derived"));
-                    test(ex.p1.ice_id().equals(PreservedClass.ice_staticId()));
-                    PreservedClass pc = (PreservedClass)ex.p1;
-                    test(pc.bc.equals("bc"));
-                    test(pc.pc.equals("pc"));
-                    test(ex.p2 == ex.p1);
-                }
-                catch(KnownPreservedDerived ex)
-                {
-                    //
-                    // For the 1.0 encoding, the unknown exception is sliced to KnownPreserved.
-                    //
-                    test(test.ice_getEncodingVersion().equals(com.zeroc.Ice.Util.Encoding_1_0));
-                    test(ex.b.equals("base"));
-                    test(ex.kp.equals("preserved"));
-                    test(ex.kpd.equals("derived"));
-                }
-                catch(com.zeroc.Ice.OperationNotExistException ex)
-                {
-                }
-                catch(Exception ex)
-                {
-                    test(false);
-                }
+            try
+            {
+                test.relayUnknownPreservedAsBase(relay);
+                test(false);
+            }
+            catch(Preserved2 ex)
+            {
+                test(ex.b.equals("base"));
+                test(ex.kp.equals("preserved"));
+                test(ex.kpd.equals("derived"));
+                test(ex.p1.ice_id().equals(PreservedClass.ice_staticId()));
+                PreservedClass pc = (PreservedClass)ex.p1;
+                test(pc.bc.equals("bc"));
+                test(pc.pc.equals("pc"));
+                test(ex.p2 == ex.p1);
+            }
+            catch(KnownPreservedDerived ex)
+            {
+                //
+                // For the 1.0 encoding, the unknown exception is sliced to KnownPreserved.
+                //
+                test(test.ice_getEncodingVersion().equals(com.zeroc.Ice.Util.Encoding_1_0));
+                test(ex.b.equals("base"));
+                test(ex.kp.equals("preserved"));
+                test(ex.kpd.equals("derived"));
+            }
+            catch(com.zeroc.Ice.OperationNotExistException ex)
+            {
+            }
+            catch(Exception ex)
+            {
+                test(false);
+            }
 
-                adapter.destroy();
+            try
+            {
+                test.relayUnknownPreservedAsKnownPreserved(relay);
+                test(false);
+            }
+            catch(Preserved2 ex)
+            {
+                test(ex.b.equals("base"));
+                test(ex.kp.equals("preserved"));
+                test(ex.kpd.equals("derived"));
+                test(ex.p1.ice_id().equals(PreservedClass.ice_staticId()));
+                PreservedClass pc = (PreservedClass)ex.p1;
+                test(pc.bc.equals("bc"));
+                test(pc.pc.equals("pc"));
+                test(ex.p2 == ex.p1);
+            }
+            catch(KnownPreservedDerived ex)
+            {
+                //
+                // For the 1.0 encoding, the unknown exception is sliced to KnownPreserved.
+                //
+                test(test.ice_getEncodingVersion().equals(com.zeroc.Ice.Util.Encoding_1_0));
+                test(ex.b.equals("base"));
+                test(ex.kp.equals("preserved"));
+                test(ex.kpd.equals("derived"));
+            }
+            catch(com.zeroc.Ice.OperationNotExistException ex)
+            {
             }
-            out.println("ok");
+            catch(Exception ex)
+            {
+                test(false);
+            }
+
+            adapter.destroy();
         }
+        out.println("ok");
 
         return test;
     }
diff --git a/java/test/src/main/java/test/Ice/slicing/exceptions/TestI.java b/java/test/src/main/java/test/Ice/slicing/exceptions/TestI.java
index b4a320ad3b4..9276497cd89 100644
--- a/java/test/src/main/java/test/Ice/slicing/exceptions/TestI.java
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/TestI.java
@@ -200,7 +200,8 @@ public final class TestI implements TestIntf
     public void relayKnownPreservedAsBase(RelayPrx r, com.zeroc.Ice.Current current)
         throws Base
     {
-        r.knownPreservedAsBase();
+        RelayPrx p = RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+        p.knownPreservedAsBase();
         test(false);
     }
 
@@ -208,7 +209,8 @@ public final class TestI implements TestIntf
     public void relayKnownPreservedAsKnownPreserved(RelayPrx r, com.zeroc.Ice.Current current)
         throws KnownPreserved
     {
-        r.knownPreservedAsKnownPreserved();
+        RelayPrx p = RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+        p.knownPreservedAsKnownPreserved();
         test(false);
     }
 
@@ -242,7 +244,8 @@ public final class TestI implements TestIntf
     public void relayUnknownPreservedAsBase(RelayPrx r, com.zeroc.Ice.Current current)
         throws Base
     {
-        r.unknownPreservedAsBase();
+        RelayPrx p = RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+        p.unknownPreservedAsBase();
         test(false);
     }
 
@@ -250,7 +253,8 @@ public final class TestI implements TestIntf
     public void relayUnknownPreservedAsKnownPreserved(RelayPrx r, com.zeroc.Ice.Current current)
         throws KnownPreserved
     {
-        r.unknownPreservedAsKnownPreserved();
+        RelayPrx p = RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+        p.unknownPreservedAsKnownPreserved();
         test(false);
     }
 }