diff options
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index ada0e33b5b8..b0532465dab 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -440,6 +440,11 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi IceUtil::StaticMutex::Lock sync(staticMutex); instanceCount++; + if(!_initData.properties) + { + _initData.properties = createProperties(); + } + if(!oneOffDone) { // @@ -472,11 +477,6 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi } } - if(!_initData.properties) - { - _initData.properties = createProperties(); - } - if(_initData.properties->getPropertyAsInt("Ice.NullHandleAbort") > 0) { IceUtil::nullHandleAbort = true; |