summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/CommunicatorI.cpp4
-rw-r--r--cpp/src/Ice/Connection.cpp2
-rw-r--r--cpp/src/Ice/ConnectionFactory.cpp2
-rw-r--r--cpp/src/IcePack/Registry.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 2aa716c8099..be71717e327 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -303,12 +303,12 @@ Ice::CommunicatorI::~CommunicatorI()
if(_instance->__getRef() > 1)
{
PropertiesPtr properties = _instance->properties();
- if(properties->getPropertyAsIntWithDefault("Ice.Warn.Leak", 1) > 0)
+ if(properties->getPropertyAsIntWithDefault("Ice.Warn.Leaks", 1) > 0)
{
Warning warn(_instance->logger());
warn <<
"The communicator is not the last Ice object that is deleted. (You can\n"
- "disable this warning by setting the property `Ice.Warn.Leak' to 0.)";
+ "disable this warning by setting the property `Ice.Warn.Leaks' to 0.)";
}
}
}
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp
index 5fefc2c52ca..cafa24581b3 100644
--- a/cpp/src/Ice/Connection.cpp
+++ b/cpp/src/Ice/Connection.cpp
@@ -852,7 +852,7 @@ IceInternal::Connection::Connection(const InstancePtr& instance,
_logger(_instance->logger()),
_traceLevels(_instance->traceLevels()),
_defaultsAndOverrides(_instance->defaultsAndOverrides()),
- _warn(_instance->properties()->getPropertyAsInt("Ice.Warn.Connection") > 0),
+ _warn(_instance->properties()->getPropertyAsInt("Ice.Warn.Connections") > 0),
_nextRequestId(1),
_requestsHint(_requests.end()),
_batchStream(_instance),
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index f1a48ca82dc..ff635001516 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -438,7 +438,7 @@ IceInternal::IncomingConnectionFactory::IncomingConnectionFactory(const Instance
EventHandler(instance),
_endpoint(endpoint),
_adapter(adapter),
- _warn(_instance->properties()->getPropertyAsInt("Ice.Warn.Connection") > 0),
+ _warn(_instance->properties()->getPropertyAsInt("Ice.Warn.Connections") > 0),
_state(StateHolding),
_registeredWithPool(false)
{
diff --git a/cpp/src/IcePack/Registry.cpp b/cpp/src/IcePack/Registry.cpp
index 180978a2f96..f08db1ee537 100644
--- a/cpp/src/IcePack/Registry.cpp
+++ b/cpp/src/IcePack/Registry.cpp
@@ -250,7 +250,7 @@ IcePack::Registry::start(bool nowarn)
// (_communicator).
//
_locatorComm = Ice::initializeWithProperties(argc, argv, _communicator->getProperties());
- _locatorComm->getProperties()->setProperty("Ice.Warn.Leak", "0");
+ _locatorComm->getProperties()->setProperty("Ice.Warn.Leaks", "0");
_locatorComm->getProperties()->setProperty(
"Ice.ServerThreadPool.Size",
properties->getPropertyWithDefault("IcePack.Registry.Locator.ServerThreadPool.Size", "6"));