From 5a57686d2ccbb085b8ac67908ad9525a6bafaf4b Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Wed, 17 Dec 2014 18:06:54 +0100
Subject: Fixed ICE-6199 - changed collocation optimization to call AMI cb
 asynchronously if AMD dispatch

---
 cpp/src/Ice/IncomingAsync.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'cpp/src/Ice/IncomingAsync.cpp')

diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index 10c0ec6ac4e..7b56ab244fc 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -191,7 +191,7 @@ IceInternal::IncomingAsync::__response()
 {
     try
     {
-        if(_locator && !__servantLocatorFinished())
+        if(_locator && !__servantLocatorFinished(true))
         {
             return;
         }
@@ -201,7 +201,7 @@ IceInternal::IncomingAsync::__response()
         if(_response)
         {
             _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4));
-            _responseHandler->sendResponse(_current.requestId, &_os, _compress);
+            _responseHandler->sendResponse(_current.requestId, &_os, _compress, true);
         }
         else
         {
@@ -213,7 +213,7 @@ IceInternal::IncomingAsync::__response()
     }
     catch(const LocalException& ex)
     {
-        _responseHandler->invokeException(_current.requestId, ex, 1); // Fatal invocation exception
+        _responseHandler->invokeException(_current.requestId, ex, 1, true); // Fatal invocation exception
     }
 }
 
@@ -222,16 +222,16 @@ IceInternal::IncomingAsync::__exception(const std::exception& exc)
 {
     try
     {
-        if(_locator && !__servantLocatorFinished())
+        if(_locator && !__servantLocatorFinished(true))
         {
             return;
         }
 
-        __handleException(exc);
+        __handleException(exc, true);
     }
     catch(const LocalException& ex)
     {
-        _responseHandler->invokeException(_current.requestId, ex, 1);  // Fatal invocation exception
+        _responseHandler->invokeException(_current.requestId, ex, 1, true);  // Fatal invocation exception
     }
 }
 
@@ -240,16 +240,16 @@ IceInternal::IncomingAsync::__exception()
 {
     try
     {
-        if(_locator && !__servantLocatorFinished())
+        if(_locator && !__servantLocatorFinished(true))
         {
             return;
         }
 
-        __handleException();
+        __handleException(true);
     }
     catch(const LocalException& ex)
     {
-        _responseHandler->invokeException(_current.requestId, ex, 1);  // Fatal invocation exception
+        _responseHandler->invokeException(_current.requestId, ex, 1, true);  // Fatal invocation exception
     }
 }
 
-- 
cgit v1.2.3