Fixed bug in communicator flush batch requests, also fixed C++ SSL issue where ice_connectionId wouldn't work

1 files changed, 11 insertions, 3 deletions

diff --git a/java/src/IceInternal/CommunicatorBatchOutgoingAsync.java b/java/src/IceInternal/CommunicatorBatchOutgoingAsync.java
index 014d6e041e6..a2c9514ebdd 100644
--- a/java/src/IceInternal/CommunicatorBatchOutgoingAsync.java
+++ b/java/src/IceInternal/CommunicatorBatchOutgoingAsync.java
@@ -90,10 +90,18 @@ public class CommunicatorBatchOutgoingAsync extends Ice.AsyncResult
             ++_useCount;
         }
         
-        int status = con.flushAsyncBatchRequests(new BatchOutgoingAsyncI());
-        if((status & AsyncStatus.Sent) > 0)
+        try
         {
-            _sentSynchronously = false;
+            int status = con.flushAsyncBatchRequests(new BatchOutgoingAsyncI());
+            if((status & AsyncStatus.Sent) > 0)
+            {
+                _sentSynchronously = false;
+            }
+        }
+        catch(Ice.LocalException ex)
+        {
+            check(false);
+            throw ex;
         }
     }