summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Instance.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-04-06 03:07:48 +0000
committerMarc Laukien <marc@zeroc.com>2002-04-06 03:07:48 +0000
commit1436dfb57e2232afaad32c9b0b845c162f544584 (patch)
tree828658d86aeb9bb1f404ac34f77ae20cd863e379 /cpp/src/Ice/Instance.cpp
parentfixes (diff)
downloadice-1436dfb57e2232afaad32c9b0b845c162f544584.tar.bz2
ice-1436dfb57e2232afaad32c9b0b845c162f544584.tar.xz
ice-1436dfb57e2232afaad32c9b0b845c162f544584.zip
fixes to collocation detection; removed INADDR_ANY; other fixes
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
-rw-r--r--cpp/src/Ice/Instance.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 0ee66450e23..4d4e4957cb2 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -276,16 +276,8 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
_logger = new LoggerI;
#endif
_traceLevels = new TraceLevels(_properties);
- _defaultProtocol = _properties->getProperty("Ice.DefaultProtocol");
- if (_defaultProtocol.empty())
- {
- _defaultProtocol = "tcp";
- }
- _defaultHost = _properties->getProperty("Ice.DefaultHost");
- if (_defaultHost.empty())
- {
- _defaultHost = getLocalHost(true);
- }
+ _defaultProtocol = _properties->getPropertyWithDefault("Ice.DefaultProtocol", "tcp");
+ _defaultHost = _properties->getPropertyWithDefault("Ice.DefaultHost", "127.0.0.1");
_routerManager = new RouterManager;
_referenceFactory = new ReferenceFactory(this);
_proxyFactory = new ProxyFactory(this);