summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/RegistryI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2013-07-03 13:32:02 +0200
committerBenoit Foucher <benoit@zeroc.com>2013-07-03 13:32:02 +0200
commit811c0f63533cfa3bb89945c7792609ebde700777 (patch)
treedd7586cf1f6ee111334895ca65ae3ef8eb00b3bc /cpp/src/IceGrid/RegistryI.cpp
parentWin32 build fixes with optional test (diff)
downloadice-811c0f63533cfa3bb89945c7792609ebde700777.tar.bz2
ice-811c0f63533cfa3bb89945c7792609ebde700777.tar.xz
ice-811c0f63533cfa3bb89945c7792609ebde700777.zip
Fixed ICE-5371 - fixed IceGrid registry executable to not require data property to be set to get help or the version with -h/-v
Diffstat (limited to 'cpp/src/IceGrid/RegistryI.cpp')
-rw-r--r--cpp/src/IceGrid/RegistryI.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index 7c763c964b3..a0dd9389099 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -372,7 +372,11 @@ RegistryI::startImpl()
out << "no database plugin configured with `Ice.Plugin.DB' or plugin is not a database plugin";
return false;
}
-
+ if(!plugin->initDB())
+ {
+ return false;
+ }
+
_database = new Database(registryAdapter, topicManager, _instanceName, _traceLevels, getInfo(), plugin, _readonly);
_wellKnownObjects = new WellKnownObjectsManager(_database);