- Added Ice.NullHandleAbort property

- Fixed Locator.ice exception names to be consistent with other exceptions.

1 files changed, 12 insertions, 0 deletions

diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 7f95182d365..614803f09a7 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -57,6 +57,13 @@ IceUtil::Mutex* Instance::_globalStateMutex = new IceUtil::Mutex;
 string Instance::_identForOpenlog;
 #endif
 
+namespace IceUtil
+{
+
+extern bool nullHandleAbort;
+
+};
+
 namespace IceInternal
 {
 
@@ -299,6 +306,11 @@ 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
 	}