Fixed bug where client thread pool thread would die if callback raised an assert

1 files changed, 30 insertions, 0 deletions

diff --git a/java/src/Ice/AsyncResult.java b/java/src/Ice/AsyncResult.java
index 0ccf2f61aea..c624ec023c4 100644
--- a/java/src/Ice/AsyncResult.java
+++ b/java/src/Ice/AsyncResult.java
@@ -264,6 +264,14 @@ public class AsyncResult
             {
                 __warning(exc);
             }
+            catch(AssertionError exc)
+            {
+                __error(exc);
+            }
+            catch(OutOfMemoryError exc)
+            {
+                __error(exc);
+            }
         }
     }
 
@@ -284,6 +292,14 @@ public class AsyncResult
             {
                 __warning(ex);
             }
+            catch(AssertionError exc)
+            {
+                __error(exc);
+            }
+            catch(OutOfMemoryError exc)
+            {
+                __error(exc);
+            }
         }
     }
 
@@ -373,6 +389,14 @@ public class AsyncResult
             {
                 __warning(ex);
             }
+            catch(AssertionError exc)
+            {
+                __error(exc);
+            }
+            catch(OutOfMemoryError exc)
+            {
+                __error(exc);
+            }
         }
     }
 
@@ -385,6 +409,12 @@ public class AsyncResult
         }
     }
 
+    protected final void __error(Error error)
+    {
+        String s = "error raised by AMI callback:\n" + IceInternal.Ex.toString(error);
+        _instance.initializationData().logger.error(s);
+    }
+
     protected IceInternal.Instance _instance;
     protected String _operation;