1 files changed, 16 insertions, 0 deletions
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index 2b8eacbdca4..c4ed6ef4887 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -573,6 +573,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 	{
 	    // Expected
 	}
+
+	communicator->getProperties()->setProperty("TestAdapter0.Endpoints", "");
+	try
+	{
+	    Ice::ObjectAdapterPtr second = 
+		communicator->createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12346 -t 10000");
+	    test(false);
+	}
+	catch(const Ice::AlreadyRegisteredException&)
+	{
+	    // Expected.
+	}
+	//
+	// Properties must remain unaffected if an exception occurs.
+	//
+	test(communicator->getProperties()->getProperty("TestAdapter0.Endpoints") == "");
 	first->deactivate();
     }
     cout << "ok" << endl;