diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-09-29 13:37:23 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-09-29 13:37:23 +0000 |
| commit | 5417605aa88e9019997ca50b4ad7692bedc09fc5 (patch) | |
| tree | 5c2df2f7eb277606f02919009f68f8a55cec91f7 /cpp/src/IceGrid/Database.cpp | |
| parent | Fixed windows compile error (diff) | |
| download | ice-5417605aa88e9019997ca50b4ad7692bedc09fc5.tar.bz2 ice-5417605aa88e9019997ca50b4ad7692bedc09fc5.tar.xz ice-5417605aa88e9019997ca50b4ad7692bedc09fc5.zip | |
Added back support for --deploy option. Locking the registry isn't required
anymore to update the database.
Diffstat (limited to 'cpp/src/IceGrid/Database.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index df7c4130c29..683bf379d52 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -239,11 +239,7 @@ Database::getObserverTopic(TopicName name) const void Database::checkSessionLock(AdminSessionI* session) { - if(_lock == 0 && session) - { - throw AccessDeniedException(); // Sessions must first acquire the lock! - } - else if(_lock != 0 && session != _lock) + if(_lock != 0 && session != _lock) { throw AccessDeniedException(_lockUserId); // Lock held by another session. } @@ -495,8 +491,6 @@ Database::updateApplication(const ApplicationUpdateInfo& updt, AdminSessionI* se void Database::syncApplicationDescriptor(const ApplicationDescriptor& newDesc, AdminSessionI* session) { - assert(session); - ServerEntrySeq entries; ApplicationUpdateInfo update; ApplicationInfo oldApp; @@ -539,8 +533,6 @@ Database::instantiateServer(const string& application, const ServerInstanceDescriptor& instance, AdminSessionI* session) { - assert(session); - ServerEntrySeq entries; ApplicationUpdateInfo update; ApplicationInfo oldApp; |