summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Object.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-06-01 11:37:10 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-06-01 11:37:10 +0200
commit63a9b33d2a7cfa02c51d3fd26feb59d8a939cb91 (patch)
tree09a189184be508992fb7a5bd9802b24dd36f1609 /cpp/src/Ice/Object.cpp
parentSimplify handling of single linux arch in Make.rules.Linux (diff)
downloadice-63a9b33d2a7cfa02c51d3fd26feb59d8a939cb91.tar.bz2
ice-63a9b33d2a7cfa02c51d3fd26feb59d8a939cb91.tar.xz
ice-63a9b33d2a7cfa02c51d3fd26feb59d8a939cb91.zip
Fixed ICE-7954 - bug in Object::ice_dispatch
Diffstat (limited to 'cpp/src/Ice/Object.cpp')
-rw-r--r--cpp/src/Ice/Object.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 0b4a3295126..f69ffc497a3 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -192,8 +192,9 @@ Ice::Object::ice_dispatch(Request& request, const DispatchInterceptorAsyncCallba
#endif
try
{
- return _iceDispatch(in, in.getCurrent());
+ bool sync = _iceDispatch(in, in.getCurrent());
in.pop();
+ return sync;
}
catch(...)
{