summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Allocatable.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2018-12-19 15:46:03 +0100
committerBenoit Foucher <benoit@zeroc.com>2018-12-19 15:46:31 +0100
commit4347b8ab60454cf3498a3eeb93690a31c8d35bd3 (patch)
tree00f316a9599f5feb9ab52385e5aeda22757b589d /cpp/src/IceGrid/Allocatable.cpp
parentCleanup Slice/errorDetection files, Close #320 (diff)
downloadice-4347b8ab60454cf3498a3eeb93690a31c8d35bd3.tar.bz2
ice-4347b8ab60454cf3498a3eeb93690a31c8d35bd3.tar.xz
ice-4347b8ab60454cf3498a3eeb93690a31c8d35bd3.zip
Fix for #121 - split the assert for the IceGrid/allocation failure
Diffstat (limited to 'cpp/src/IceGrid/Allocatable.cpp')
-rw-r--r--cpp/src/IceGrid/Allocatable.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/Allocatable.cpp b/cpp/src/IceGrid/Allocatable.cpp
index 2298fe82b8a..29c36b32450 100644
--- a/cpp/src/IceGrid/Allocatable.cpp
+++ b/cpp/src/IceGrid/Allocatable.cpp
@@ -269,7 +269,8 @@ Allocatable::release(const SessionIPtr& session, bool fromRelease)
allocatable = dequeueAllocationAttempt(request);
if(!allocatable)
{
- assert(_count == 0 && _requests.empty());
+ assert(_requests.empty());
+ assert(_count == 0);
_releasing = false;
notifyAll();
return;