Fixed ICE-6199 - changed collocation optimization to call AMI cb asynchronously if AMD dispatch

1 files changed, 29 insertions, 29 deletions

diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index ddcbea13f11..e583913e5a0 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -1477,7 +1477,7 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con
 }
 
 void
-Ice::ConnectionI::sendResponse(Int, BasicStream* os, Byte compressFlag)
+Ice::ConnectionI::sendResponse(Int, BasicStream* os, Byte compressFlag, bool /*amd*/)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
     assert(_state > StateNotValidated);
@@ -1550,11 +1550,37 @@ Ice::ConnectionI::sendNoResponse()
 }
 
 bool
-Ice::ConnectionI::systemException(Int, const SystemException&)
+Ice::ConnectionI::systemException(Int, const SystemException&, bool /*amd*/)
 {
     return false; // System exceptions aren't marshalled.
 }
 
+void
+Ice::ConnectionI::invokeException(Ice::Int, const LocalException& ex, int invokeNum, bool /*amd*/)
+{
+    //
+    // Fatal exception while invoking a request. Since sendResponse/sendNoResponse isn't
+    // called in case of a fatal exception we decrement _dispatchCount here.
+    //
+
+    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+    setState(StateClosed, ex);
+
+    if(invokeNum > 0)
+    {
+        assert(_dispatchCount >= invokeNum);
+        _dispatchCount -= invokeNum;
+        if(_dispatchCount == 0)
+        {
+            if(_state == StateFinished)
+            {
+                reap();
+            }
+            notifyAll();
+        }
+    }
+}
+
 EndpointIPtr
 Ice::ConnectionI::endpoint() const
 {
@@ -2359,32 +2385,6 @@ Ice::ConnectionI::exception(const LocalException& ex)
     setState(StateClosed, ex);
 }
 
-void
-Ice::ConnectionI::invokeException(Ice::Int, const LocalException& ex, int invokeNum)
-{
-    //
-    // Fatal exception while invoking a request. Since sendResponse/sendNoResponse isn't
-    // called in case of a fatal exception we decrement _dispatchCount here.
-    //
-
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-    setState(StateClosed, ex);
-
-    if(invokeNum > 0)
-    {
-        assert(_dispatchCount >= invokeNum);
-        _dispatchCount -= invokeNum;
-        if(_dispatchCount == 0)
-        {
-            if(_state == StateFinished)
-            {
-                reap();
-            }
-            notifyAll();
-        }
-    }
-}
-
 Ice::ConnectionI::ConnectionI(const CommunicatorPtr& communicator,
                               const InstancePtr& instance,
                               const ACMMonitorPtr& monitor,
@@ -3708,7 +3708,7 @@ Ice::ConnectionI::invokeAll(BasicStream& stream, Int invokeNum, Int requestId, B
     }
     catch(const LocalException& ex)
     {
-        invokeException(requestId, ex, invokeNum);  // Fatal invocation exception
+        invokeException(requestId, ex, invokeNum, false);  // Fatal invocation exception
     }
 }