2 files changed, 7 insertions, 2 deletions
diff --git a/cpp/src/Glacier/GlacierRouter.cpp b/cpp/src/Glacier/GlacierRouter.cpp
index 9ec066b343a..2035ef2d13c 100644
--- a/cpp/src/Glacier/GlacierRouter.cpp
+++ b/cpp/src/Glacier/GlacierRouter.cpp
@@ -175,6 +175,7 @@ Glacier::RouterApp::run(int argc, char* argv[])
     }
     ObjectAdapterPtr clientAdapter = communicator()->createObjectAdapterFromProperty("Client",
 										     clientEndpointsProperty);
+    clientAdapter->setLocator(0);
 
     //
     // Initialize the server object adapter.
@@ -185,6 +186,7 @@ Glacier::RouterApp::run(int argc, char* argv[])
     if(!serverEndpoints.empty())
     {
 	serverAdapter = communicator()->createObjectAdapterFromProperty("Server", serverEndpointsProperty);
+	serverAdapter->setLocator(0);
     }
 
     //
@@ -231,6 +233,7 @@ Glacier::RouterApp::run(int argc, char* argv[])
 
     ObjectAdapterPtr routerAdapter =
 	communicator()->createObjectAdapterFromProperty("Router", routerEndpointsProperty);
+    routerAdapter->setLocator(0);
     RouterPtr router = new RouterI(clientAdapter, serverAdapter, routingTable, sessionManagerPrx, userId);
     routerAdapter->add(router, stringToIdentity(routerIdentity));
 
diff --git a/cpp/src/Glacier/GlacierStarter.cpp b/cpp/src/Glacier/GlacierStarter.cpp
index 9fa78e10c8a..e337d7bd0ab 100644
--- a/cpp/src/Glacier/GlacierStarter.cpp
+++ b/cpp/src/Glacier/GlacierStarter.cpp
@@ -71,8 +71,9 @@ Glacier::RouterApp::run(int argc, char* argv[])
     PropertiesPtr properties = communicator()->getProperties();
 
     //
-    // Initialize the object adapter.
-    //
+    // Initialize the object adapter (and make sure this object
+    // adapter doesn't register itself with the locator).
+    // 
     const char* endpointsProperty = "Glacier.Starter.Endpoints";
     string endpoints = properties->getProperty(endpointsProperty);
     if(endpoints.empty())
@@ -81,6 +82,7 @@ Glacier::RouterApp::run(int argc, char* argv[])
 	return EXIT_FAILURE;
     }
     ObjectAdapterPtr adapter = communicator()->createObjectAdapterFromProperty("Starter", endpointsProperty);
+    adapter->setLocator(0);
 
     //
     // Get the password verifier, or create one if no verifier is