summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Instance.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2001-12-06 19:27:15 +0000
committerMarc Laukien <marc@zeroc.com>2001-12-06 19:27:15 +0000
commit1e9d01c5622565bf8c578021433085b974ecc47b (patch)
treea8cad8eda26de8dfc180ad11887253efcab47484 /cpp/src/Ice/Instance.cpp
parentupdate all dependencies. (diff)
downloadice-1e9d01c5622565bf8c578021433085b974ecc47b.tar.bz2
ice-1e9d01c5622565bf8c578021433085b974ecc47b.tar.xz
ice-1e9d01c5622565bf8c578021433085b974ecc47b.zip
default protocol
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
-rw-r--r--cpp/src/Ice/Instance.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 33895d85e31..4740a822b3c 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -141,6 +141,14 @@ IceInternal::Instance::threadPool()
return _threadPool;
}
+string
+IceInternal::Instance::defaultProtocol()
+{
+ // No synchronization necessary
+ // JTCSyncT<JTCMutex> sync(*this);
+ return _defaultProtocol;
+}
+
IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const PropertiesPtr& properties) :
_communicator(communicator),
_properties(properties)
@@ -256,6 +264,11 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
_userExceptionFactoryManager = new UserExceptionFactoryManager();
_objectAdapterFactory = new ObjectAdapterFactory(this);
_threadPool = new ThreadPool(this);
+ _defaultProtocol = _properties->getProperty("Ice.DefaultProtocol");
+ if (_defaultProtocol.empty())
+ {
+ _defaultProtocol = "tcp";
+ }
}
catch(...)
{