diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-07-04 13:27:42 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-07-04 13:27:42 +0000 |
| commit | 76a20f30381ead264ac2109284dd27ce307173e9 (patch) | |
| tree | e8b05d5592f2c3a4c485d78a1915eee84ffb961e /cpp/src | |
| parent | fixing NullHandleException (diff) | |
| download | ice-76a20f30381ead264ac2109284dd27ce307173e9.tar.bz2 ice-76a20f30381ead264ac2109284dd27ce307173e9.tar.xz ice-76a20f30381ead264ac2109284dd27ce307173e9.zip | |
proper fix for NullHandleException
Diffstat (limited to 'cpp/src')
| -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; |