diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-11-08 15:12:45 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-11-08 15:12:45 +0000 |
| commit | e5facb22164907ece10d3450e57a0b165fc85752 (patch) | |
| tree | 6ba33215ebc8874da2285c600791cac92e90f6ab /cpp/src | |
| parent | Fixed compile error on HP (diff) | |
| download | ice-e5facb22164907ece10d3450e57a0b165fc85752.tar.bz2 ice-e5facb22164907ece10d3450e57a0b165fc85752.tar.xz ice-e5facb22164907ece10d3450e57a0b165fc85752.zip | |
Added IceGrid.Registry.AdminSessionTimeout.
Wait for server synchronization after adding/updating/removing an
application.
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/ServerCache.cpp | 8 |
3 files changed, 10 insertions, 3 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index c2cd9df782d..6a84836a162 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -7,7 +7,7 @@ // // ********************************************************************** -// Generated by makeprops.py from file `../config/PropertyNames.def', Thu Nov 3 21:57:55 2005 +// Generated by makeprops.py from file `../config/PropertyNames.def', Tue Nov 8 17:10:31 2005 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -127,6 +127,7 @@ const char* IceInternal::PropertyNames::IceGridProps[] = "IceGrid.Registry.Admin.ThreadPool.SizeMax", "IceGrid.Registry.Admin.ThreadPool.SizeWarn", "IceGrid.Registry.Admin.ThreadPool.StackSize", + "IceGrid.Registry.AdminSessionTimeout", "IceGrid.Registry.Client.AdapterId", "IceGrid.Registry.Client.ReplicaGroupId", "IceGrid.Registry.Client.Endpoints", diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 8ce46912b47..8c151965ab6 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -7,7 +7,7 @@ // // ********************************************************************** -// Generated by makeprops.py from file `../config/PropertyNames.def', Thu Nov 3 21:57:55 2005 +// Generated by makeprops.py from file `../config/PropertyNames.def', Tue Nov 8 17:10:31 2005 // IMPORTANT: Do not edit this file -- any edits made here will be lost! diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index c71e56dde66..6d68386113a 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -190,7 +190,13 @@ ServerEntry::ServerEntry(Cache<string, ServerEntry>& cache, const string& id) : void ServerEntry::sync() { - syncImpl(false); + try + { + syncImpl(true); + } + catch(const Ice::Exception&) + { + } } void |