summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/CollocatedRequestHandler.h
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-12-17 18:06:54 +0100
committerBenoit Foucher <benoit@zeroc.com>2014-12-17 18:06:54 +0100
commit5a57686d2ccbb085b8ac67908ad9525a6bafaf4b (patch)
tree58c2219412e8af66fbfd66d5269af6b7a48b28d2 /cpp/src/Ice/CollocatedRequestHandler.h
parentAvoid check_output isn't supported with python 2.6 (diff)
downloadice-5a57686d2ccbb085b8ac67908ad9525a6bafaf4b.tar.bz2
ice-5a57686d2ccbb085b8ac67908ad9525a6bafaf4b.tar.xz
ice-5a57686d2ccbb085b8ac67908ad9525a6bafaf4b.zip
Fixed ICE-6199 - changed collocation optimization to call AMI cb asynchronously if AMD dispatch
Diffstat (limited to 'cpp/src/Ice/CollocatedRequestHandler.h')
-rw-r--r--cpp/src/Ice/CollocatedRequestHandler.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/CollocatedRequestHandler.h b/cpp/src/Ice/CollocatedRequestHandler.h
index d2d8c5bab01..1075af2f119 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.h
+++ b/cpp/src/Ice/CollocatedRequestHandler.h
@@ -56,10 +56,10 @@ public:
virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&);
virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&);
- virtual void sendResponse(Ice::Int, BasicStream*, Ice::Byte);
+ virtual void sendResponse(Ice::Int, BasicStream*, Ice::Byte, bool);
virtual void sendNoResponse();
- virtual bool systemException(Ice::Int, const Ice::SystemException&);
- virtual void invokeException(Ice::Int, const Ice::LocalException&, int);
+ virtual bool systemException(Ice::Int, const Ice::SystemException&, bool);
+ virtual void invokeException(Ice::Int, const Ice::LocalException&, int, bool);
const ReferencePtr& getReference() const { return _reference; } // Inlined for performances.
@@ -78,7 +78,7 @@ public:
private:
- void handleException(Ice::Int, const Ice::Exception&);
+ void handleException(Ice::Int, const Ice::Exception&, bool);
const Ice::ObjectAdapterIPtr _adapter;
const bool _dispatcher;