summaryrefslogtreecommitdiff
path: root/cpp/src/Freeze/ConnectionI.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2014-09-18 15:21:47 -0230
committerDwayne Boone <dwayne@zeroc.com>2014-09-18 15:21:47 -0230
commit7f90f0b6d10d75e0bcb5d9b32ad18d2dfa6a9355 (patch)
treed1672e43bdc70a5aab2eaf043470560498eef90f /cpp/src/Freeze/ConnectionI.cpp
parentICE-5661 add proxy->begin_ice_getConnection (diff)
downloadice-7f90f0b6d10d75e0bcb5d9b32ad18d2dfa6a9355.tar.bz2
ice-7f90f0b6d10d75e0bcb5d9b32ad18d2dfa6a9355.tar.xz
ice-7f90f0b6d10d75e0bcb5d9b32ad18d2dfa6a9355.zip
ICE-5677 consistent checking of boolean properties
Diffstat (limited to 'cpp/src/Freeze/ConnectionI.cpp')
-rw-r--r--cpp/src/Freeze/ConnectionI.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Freeze/ConnectionI.cpp b/cpp/src/Freeze/ConnectionI.cpp
index 5dc7cd7655a..804f542f574 100644
--- a/cpp/src/Freeze/ConnectionI.cpp
+++ b/cpp/src/Freeze/ConnectionI.cpp
@@ -85,10 +85,10 @@ Freeze::ConnectionI::close()
{
(*_mapList.begin())->close();
}
-
+
_dbEnv = 0;
}
-
+
CommunicatorPtr
Freeze::ConnectionI::getCommunicator() const
{
@@ -171,7 +171,7 @@ Freeze::ConnectionI::ConnectionI(const SharedDbEnvPtr& dbEnv) :
_envName(dbEnv->getEnvName()),
_trace(_communicator->getProperties()->getPropertyAsInt("Freeze.Trace.Map")),
_txTrace(_communicator->getProperties()->getPropertyAsInt("Freeze.Trace.Transaction")),
- _deadlockWarning(_communicator->getProperties()->getPropertyAsInt("Freeze.Warn.Deadlocks") != 0),
+ _deadlockWarning(_communicator->getProperties()->getPropertyAsInt("Freeze.Warn.Deadlocks") > 0),
_refCountMutex(new SharedMutex),
_refCount(0)
{
@@ -199,14 +199,14 @@ Freeze::ConnectionI::unregisterMap(MapHelperI* m)
_mapList.remove(m);
}
-Freeze::ConnectionPtr
+Freeze::ConnectionPtr
Freeze::createConnection(const CommunicatorPtr& communicator, const string& envName)
{
-
+
return new ConnectionI(SharedDbEnv::get(communicator, envName, 0));
}
-Freeze::ConnectionPtr
+Freeze::ConnectionPtr
Freeze::createConnection(const CommunicatorPtr& communicator, const string& envName, DbEnv& dbEnv)
{
return new ConnectionI(SharedDbEnv::get(communicator, envName, &dbEnv));