1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index d37efab7549..637bc619ca9 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -242,19 +242,19 @@ RegistryI::start(bool nowarn)
     }
 
     //
-    // Create the internal registries (node, server, adapter, object).
-    //
-    const string envName = "Registry";
-    properties->setProperty("Freeze.DbEnv.Registry.DbHome", dbPath);
-    _database = new Database(registryAdapter, envName, _nodeSessionTimeout, traceLevels);
-
-    //
     // Get the instance name
     //
     const string instanceNameProperty = "IceGrid.InstanceName";
     string instanceName = properties->getPropertyWithDefault(instanceNameProperty, "IceGrid");
 
     //
+    // Create the internal registries (node, server, adapter, object).
+    //
+    const string envName = "Registry";
+    properties->setProperty("Freeze.DbEnv.Registry.DbHome", dbPath);
+    _database = new Database(registryAdapter, envName, instanceName, _nodeSessionTimeout, traceLevels);
+
+    //
     // Create the locator registry and locator interfaces.
     //
     bool dynamicReg = properties->getPropertyAsInt("IceGrid.Registry.DynamicRegistration") > 0;