diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-09-26 18:39:28 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-26 18:39:28 +0200 |
| commit | aa3c4ebfa279188cf689c6ef2318ed573c4fec7b (patch) | |
| tree | c7c1c9b7b6ce2daee3cd9b5507a49d3520fd1d06 /cpp/src/Ice/CollocatedRequestHandler.cpp | |
| parent | Slightly improved fix for ICE-3692 (diff) | |
| download | ice-aa3c4ebfa279188cf689c6ef2318ed573c4fec7b.tar.bz2 ice-aa3c4ebfa279188cf689c6ef2318ed573c4fec7b.tar.xz ice-aa3c4ebfa279188cf689c6ef2318ed573c4fec7b.zip | |
Fixed deadlock in connection binding code (ICE-5693)
Diffstat (limited to 'cpp/src/Ice/CollocatedRequestHandler.cpp')
| -rw-r--r-- | cpp/src/Ice/CollocatedRequestHandler.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp index 95c151ff6e2..0b08198726a 100644 --- a/cpp/src/Ice/CollocatedRequestHandler.cpp +++ b/cpp/src/Ice/CollocatedRequestHandler.cpp @@ -150,6 +150,18 @@ CollocatedRequestHandler::~CollocatedRequestHandler() { } +RequestHandlerPtr +CollocatedRequestHandler::connect() +{ + return this; +} + +RequestHandlerPtr +CollocatedRequestHandler::update(const RequestHandlerPtr& previousHandler, const RequestHandlerPtr& newHandler) +{ + return previousHandler.get() == this ? newHandler : this; +} + void CollocatedRequestHandler::prepareBatchRequest(BasicStream* os) { |