summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-10-08 14:23:23 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-10-08 14:23:23 +0200
commit5e32c13bfca3464e8b45910259edc4b1f2153e35 (patch)
treeedbae961e8188aa2643bf35c5ad8303760c964f3 /cpp/src/Ice/ConnectionI.cpp
parentFixed ICE-5718 - thread pool serializing dispatch bug (diff)
downloadice-5e32c13bfca3464e8b45910259edc4b1f2153e35.tar.bz2
ice-5e32c13bfca3464e8b45910259edc4b1f2153e35.tar.xz
ice-5e32c13bfca3464e8b45910259edc4b1f2153e35.zip
Fixed ACM bug where the activity wasn't always updated after parsing or sending a message
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
-rw-r--r--cpp/src/Ice/ConnectionI.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index df2aef8affd..1bdbeb12448 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -1878,12 +1878,6 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
scheduleTimeout(newOp);
_threadPool->update(this, current.operation, newOp);
}
-
- if(!readyOp)
- {
- assert(dispatchCount == 0);
- return;
- }
}
if(_acmLastActivity != IceUtil::Time())