diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-11-12 11:22:37 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-11-12 11:22:37 +0100 |
| commit | a000857ff6a9ad91cc1931ce367520f66b9f5a80 (patch) | |
| tree | 877505ed78f842594814b6b627323a589ac2675b /cpp/src/IceGrid/Database.cpp | |
| parent | Fixed bug 3537 - Assertion when Ice.ThreadPool.Client thread creation fails (diff) | |
| parent | Fixed bug 3539 - SEGFAULT if thread start() fails in constructor (diff) | |
| download | ice-a000857ff6a9ad91cc1931ce367520f66b9f5a80.tar.bz2 ice-a000857ff6a9ad91cc1931ce367520f66b9f5a80.tar.xz ice-a000857ff6a9ad91cc1931ce367520f66b9f5a80.zip | |
Merge commit 'origin/R3_3_branch'
Diffstat (limited to 'cpp/src/IceGrid/Database.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index 5e5ff949aef..b2d91a0b61d 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -395,7 +395,7 @@ Database::syncApplicationDescriptor(const ApplicationDescriptor& newDesc, AdminS Lock sync(*this); checkSessionLock(session); - while(_updating.find(update.descriptor.name) != _updating.end()) + while(_updating.find(newDesc.name) != _updating.end()) { wait(); } |