diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-05-23 11:59:44 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-05-23 11:59:44 +0200 |
| commit | d81701ca8182942b7936f9fd84a019b695e9c890 (patch) | |
| tree | dc036c9d701fbbe1afad67782bd78572c0f61974 /cpp/src/IceGrid/AdminSessionI.cpp | |
| parent | Fixed bug ICE-5543: stringToIdentity bug with escaped escapes (diff) | |
| download | ice-d81701ca8182942b7936f9fd84a019b695e9c890.tar.bz2 ice-d81701ca8182942b7936f9fd84a019b695e9c890.tar.xz ice-d81701ca8182942b7936f9fd84a019b695e9c890.zip | |
Added support for invocation timeouts and ACM heartbeats
Diffstat (limited to 'cpp/src/IceGrid/AdminSessionI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/AdminSessionI.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp index accaa59f429..cfaf3fd686d 100644 --- a/cpp/src/IceGrid/AdminSessionI.cpp +++ b/cpp/src/IceGrid/AdminSessionI.cpp @@ -77,7 +77,7 @@ AdminSessionI::_register(const SessionServantManagerPtr& servantManager, const I string category; - if(con != 0) + if(con) { category = _database->getInstanceName() + "-" + IceUtil::generateUUID(); @@ -86,9 +86,11 @@ AdminSessionI::_register(const SessionServantManagerPtr& servantManager, const I templateId.category = category; _adminCallbackTemplate = _registry->createAdminCallbackProxy(templateId); + + setConnectionCallback(con); } - Ice::ObjectPrx session = _servantManager->addSession(this, con, category); + Ice::ObjectPrx session = _servantManager->addSession(this, con, category); _admin = AdminPrx::uncheckedCast(_servantManager->add(new AdminI(_database, _registry, this), this)); |