summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Instance.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-04-12 15:10:24 +0000
committerMarc Laukien <marc@zeroc.com>2002-04-12 15:10:24 +0000
commit23a9e91ab61541591254d2f8fceb7c1d8e2cbe9e (patch)
treedc57e5457b0d19447c080f7e55c8ac6f9edeae74 /cpp/src/Ice/Instance.cpp
parentWIN32->_WIN32 (diff)
downloadice-23a9e91ab61541591254d2f8fceb7c1d8e2cbe9e.tar.bz2
ice-23a9e91ab61541591254d2f8fceb7c1d8e2cbe9e.tar.xz
ice-23a9e91ab61541591254d2f8fceb7c1d8e2cbe9e.zip
brought getLocalHost() back; changes to IcePatch (not finished)
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
-rw-r--r--cpp/src/Ice/Instance.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 199e5e1b4da..d883f3dbb0f 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -277,7 +277,11 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
#endif
_traceLevels = new TraceLevels(_properties);
_defaultProtocol = _properties->getPropertyWithDefault("Ice.DefaultProtocol", "tcp");
- _defaultHost = _properties->getPropertyWithDefault("Ice.DefaultHost", "127.0.0.1");
+ _defaultHost = _properties->getProperty("Ice.DefaultHost");
+ if (_defaultHost.empty())
+ {
+ _defaultHost = getLocalHost(true);
+ }
_routerManager = new RouterManager;
_referenceFactory = new ReferenceFactory(this);
_proxyFactory = new ProxyFactory(this);