Fixed ICE-5150: assert in OutgoingAsync._finished, fixed CHANGES

5 files changed, 58 insertions, 0 deletions

diff --git a/java/test/Ice/exceptions/AMDThrowerI.java b/java/test/Ice/exceptions/AMDThrowerI.java
index 5b67f4ed442..3f0c04c6ec0 100644
--- a/java/test/Ice/exceptions/AMDThrowerI.java
+++ b/java/test/Ice/exceptions/AMDThrowerI.java
@@ -22,6 +22,7 @@ import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwCasA;
 import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwCasB;
 import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwCasC;
 import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwLocalException;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwLocalExceptionIdempotent;
 import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwNonIceException;
 import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwUndeclaredA;
 import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwUndeclaredB;
@@ -188,6 +189,12 @@ public final class AMDThrowerI extends _ThrowerDisp
     }
 
     public void
+    throwLocalExceptionIdempotent_async(AMD_Thrower_throwLocalExceptionIdempotent cb, Ice.Current current)
+    {
+        cb.ice_exception(new Ice.TimeoutException());
+    }
+
+    public void
     throwAfterResponse_async(AMD_Thrower_throwAfterResponse cb, Ice.Current current)
     {
         cb.ice_response();
diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java
index 801ab5addde..d15c956ab79 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/Ice/exceptions/AllTests.java
@@ -21,6 +21,7 @@ import test.Ice.exceptions.Test.AMI_Thrower_throwCasA;
 import test.Ice.exceptions.Test.AMI_Thrower_throwCasB;
 import test.Ice.exceptions.Test.AMI_Thrower_throwCasC;
 import test.Ice.exceptions.Test.AMI_Thrower_throwLocalException;
+import test.Ice.exceptions.Test.AMI_Thrower_throwLocalExceptionIdempotent;
 import test.Ice.exceptions.Test.AMI_Thrower_throwNonIceException;
 import test.Ice.exceptions.Test.AMI_Thrower_throwUndeclaredA;
 import test.Ice.exceptions.Test.AMI_Thrower_throwUndeclaredB;
@@ -42,6 +43,7 @@ import test.Ice.exceptions.Test.Callback_Thrower_throwCasA;
 import test.Ice.exceptions.Test.Callback_Thrower_throwCasB;
 import test.Ice.exceptions.Test.Callback_Thrower_throwCasC;
 import test.Ice.exceptions.Test.Callback_Thrower_throwLocalException;
+import test.Ice.exceptions.Test.Callback_Thrower_throwLocalExceptionIdempotent;
 import test.Ice.exceptions.Test.Callback_Thrower_throwNonIceException;
 import test.Ice.exceptions.Test.Callback_Thrower_throwUndeclaredA;
 import test.Ice.exceptions.Test.Callback_Thrower_throwUndeclaredB;
@@ -1245,6 +1247,9 @@ public class AllTests
             catch(Ice.UnknownLocalException ex)
             {
             }
+            catch(Ice.OperationNotExistException ex)
+            {
+            }
             catch(Throwable ex)
             {
                 ex.printStackTrace();
@@ -1820,6 +1825,23 @@ public class AllTests
             test(false);
         }
 
+        try
+        {
+            thrower.throwLocalExceptionIdempotent();
+            test(false);
+        }
+        catch(Ice.UnknownLocalException ex)
+        {
+        }
+        catch(Ice.OperationNotExistException ex)
+        {
+        }
+        catch(Throwable ex)
+        {
+            ex.printStackTrace();
+            test(false);
+        }
+
         out.println("ok");
 
         out.print("catching unknown non-Ice exception... ");
@@ -2179,6 +2201,25 @@ public class AllTests
                 cb.check();
             }
 
+            {
+                final Callback_Thrower_throwLocalExceptionI cb = new Callback_Thrower_throwLocalExceptionI();
+                thrower.begin_throwLocalExceptionIdempotent(new Callback_Thrower_throwLocalExceptionIdempotent()
+                    {
+                        @Override
+                        public void response()
+                        {
+                            cb.response();
+                        }
+
+                        @Override
+                        public void exception(Ice.LocalException exc)
+                        {
+                            cb.exception(exc);
+                        }
+                    });
+                cb.check();
+            }
+
             out.println("ok");
 
             out.print("catching unknown non-Ice exception with new AMI mapping... ");
diff --git a/java/test/Ice/exceptions/Test.ice b/java/test/Ice/exceptions/Test.ice
index ec93564a599..18d61ec8ccf 100644
--- a/java/test/Ice/exceptions/Test.ice
+++ b/java/test/Ice/exceptions/Test.ice
@@ -60,6 +60,8 @@ exception D
     void throwNonIceException();
     void throwAssertException();
 
+    idempotent void throwLocalExceptionIdempotent();
+
     void throwAfterResponse();
     void throwAfterException() throws A;
 };
diff --git a/java/test/Ice/exceptions/TestAMD.ice b/java/test/Ice/exceptions/TestAMD.ice
index 3cf7b850e77..aa7a3aa3c32 100644
--- a/java/test/Ice/exceptions/TestAMD.ice
+++ b/java/test/Ice/exceptions/TestAMD.ice
@@ -55,6 +55,8 @@ exception D
     void throwNonIceException();
     void throwAssertException();
 
+    idempotent void throwLocalExceptionIdempotent();
+
     void throwAfterResponse();
     void throwAfterException() throws A;
 };
diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/Ice/exceptions/ThrowerI.java
index fab7640b0eb..5ca5e735006 100644
--- a/java/test/Ice/exceptions/ThrowerI.java
+++ b/java/test/Ice/exceptions/ThrowerI.java
@@ -138,6 +138,12 @@ public final class ThrowerI extends _ThrowerDisp
     }
 
     public void
+    throwLocalExceptionIdempotent(Ice.Current current)
+    {
+        throw new Ice.TimeoutException();
+    }
+
+    public void
     throwNonIceException(Ice.Current current)
     {
         throw new RuntimeException();