summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Allocatable.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2006-06-13 07:23:00 +0000
committerBenoit Foucher <benoit@zeroc.com>2006-06-13 07:23:00 +0000
commit5951e80da6cf279e6398b216f27966d67758ae0e (patch)
tree93af3e6a6c779c847bbb4672898c123d0bb87ee4 /cpp/src/IceGrid/Allocatable.cpp
parentImproved deprecation messages to mention operation name of deprecated (diff)
downloadice-5951e80da6cf279e6398b216f27966d67758ae0e.tar.bz2
ice-5951e80da6cf279e6398b216f27966d67758ae0e.tar.xz
ice-5951e80da6cf279e6398b216f27966d67758ae0e.zip
Fixed allocation bug
Diffstat (limited to 'cpp/src/IceGrid/Allocatable.cpp')
-rw-r--r--cpp/src/IceGrid/Allocatable.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/Allocatable.cpp b/cpp/src/IceGrid/Allocatable.cpp
index d5135c86134..d374c3fb8f5 100644
--- a/cpp/src/IceGrid/Allocatable.cpp
+++ b/cpp/src/IceGrid/Allocatable.cpp
@@ -451,7 +451,7 @@ Allocatable::allocateFromChild(const AllocationRequestPtr& request,
}
Lock sync(*this);
- if(!_session && (fromRelease || !_releasing) || _session == request->getSession())
+ if((!_session || _session == request->getSession()) && (fromRelease || !_releasing))
{
if(!_session)
{