diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2003-01-27 15:23:31 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2003-01-27 15:23:31 +0000 |
| commit | 9beedd4428672837be55ed61f9f3979b5be60cc8 (patch) | |
| tree | bb2c766cc3e38ee481d51e4c951e0ed66d2793a3 /cpp/src/Ice/Instance.cpp | |
| parent | fix (diff) | |
| download | ice-9beedd4428672837be55ed61f9f3979b5be60cc8.tar.bz2 ice-9beedd4428672837be55ed61f9f3979b5be60cc8.tar.xz ice-9beedd4428672837be55ed61f9f3979b5be60cc8.zip | |
Fix for NullHandleAbort not being set on Windows
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 940342f03c6..6626616565e 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -260,6 +260,11 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, int& argc, { srand(static_cast<timeval>(IceUtil::Time::now()).tv_usec); + if(_properties->getPropertyAsInt("Ice.NullHandleAbort") > 0) + { + IceUtil::nullHandleAbort = true; + } + #ifdef _WIN32 WORD version = MAKEWORD(1, 1); WSADATA data; @@ -314,11 +319,6 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, int& argc, } openlog(_identForOpenlog.c_str(), LOG_PID, LOG_USER); } - - if(_properties->getPropertyAsInt("Ice.NullHandleAbort") > 0) - { - IceUtil::nullHandleAbort = true; - } #endif } |