diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-06-15 13:57:55 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-06-15 13:57:55 +0000 |
| commit | 450e12e5c80d8d6716bf9055777c0adb52c5dabb (patch) | |
| tree | e1a397bcf78566d17931dd29790e090a9289b60d /cpp/src | |
| parent | Restructured the .net SSL installation so it could be isolated from the (diff) | |
| download | ice-450e12e5c80d8d6716bf9055777c0adb52c5dabb.tar.bz2 ice-450e12e5c80d8d6716bf9055777c0adb52c5dabb.tar.xz ice-450e12e5c80d8d6716bf9055777c0adb52c5dabb.zip | |
Fixed IceGrid property and slice documentation.
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/DescriptorHelper.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/IceGrid/LocatorI.cpp | 8 |
4 files changed, 3 insertions, 11 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 642b24dfdf3..7e51686112a 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', Tue Jun 13 09:36:23 2006 +// Generated by makeprops.py from file `../config/PropertyNames.def', Thu Jun 15 15:56:17 2006 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -170,6 +170,7 @@ const char* IceInternal::PropertyNames::IceGridProps[] = "IceGrid.Registry.Server.ThreadPool.SizeMax", "IceGrid.Registry.Server.ThreadPool.SizeWarn", "IceGrid.Registry.Server.ThreadPool.StackSize", + "IceGrid.Registry.SessionTimeout", "IceGrid.Registry.SSLPermissionsVerifier", "IceGrid.Registry.Trace.Application", "IceGrid.Registry.Trace.Adapter", diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 9ebb1f6a180..2fc5e73cdf4 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', Tue Jun 13 09:36:23 2006 +// Generated by makeprops.py from file `../config/PropertyNames.def', Thu Jun 15 15:56:17 2006 // IMPORTANT: Do not edit this file -- any edits made here will be lost! diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index 73e8b5a0b1a..e51ed917446 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -2023,7 +2023,6 @@ NodeHelper::hasDistributions(const string& server) const // // Get the server distributions to patch. // - DistributionDescriptorDict distribs; if(server.empty()) { ServerInstanceHelperDict::const_iterator p; diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp index 1644edca220..e31d8277784 100644 --- a/cpp/src/IceGrid/LocatorI.cpp +++ b/cpp/src/IceGrid/LocatorI.cpp @@ -331,14 +331,6 @@ LocatorI::findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& cb, assert(proxy); - const TraceLevelsPtr traceLevels = _database->getTraceLevels(); - if(traceLevels->locator > 2) - { - Ice::Trace out(traceLevels->logger, traceLevels->locatorCat); - out << "resolved object `" << _database->getCommunicator()->identityToString(id) << "' proxy: `" - << proxy->ice_toString() << "'"; - } - // // OPTIMIZATION: If the object is registered with an adapter id, // try to get the adapter direct proxy (which might caused the |