Fixed ICE-5371 - fixed IceGrid registry executable to not require data property to be set to get help or the version with -h/-v

1 files changed, 25 insertions, 14 deletions

diff --git a/cpp/src/IceGrid/FreezeDB/FreezeDB.cpp b/cpp/src/IceGrid/FreezeDB/FreezeDB.cpp
index 5cf4689416c..06faa62a020 100644
--- a/cpp/src/IceGrid/FreezeDB/FreezeDB.cpp
+++ b/cpp/src/IceGrid/FreezeDB/FreezeDB.cpp
@@ -131,36 +131,47 @@ FreezeConnectionPool::getInternalObjects(const IceDB::DatabaseConnectionPtr& con
 
 FreezeDBPlugin::FreezeDBPlugin(const Ice::CommunicatorPtr& communicator) : _communicator(communicator)
 {
+}
+
+void
+FreezeDBPlugin::initialize()
+{
+}
+
+void
+FreezeDBPlugin::destroy()
+{
+    _connectionPool = 0;
+}
+
+bool
+FreezeDBPlugin::initDB()
+{
     string dbPath = _communicator->getProperties()->getProperty("IceGrid.Registry.Data");
     if(dbPath.empty())
     {
-        throw Ice::PluginInitializationException(__FILE__, __LINE__, "property `IceGrid.Registry.Data' is not set");
+        Ice::Error out(_communicator->getLogger());
+        out << "property `IceGrid.Registry.Data' is not set";
+        return false;
     }
     else
     {
         if(!IceUtilInternal::directoryExists(dbPath))
-        {
-            ostringstream os;
+        {            
             Ice::SyscallException ex(__FILE__, __LINE__);
             ex.error = IceInternal::getSystemErrno();
-            os << "property `IceGrid.Registry.Data' is set to an invalid path:\n" << ex;
-            throw Ice::PluginInitializationException(__FILE__, __LINE__, os.str());
+
+            Ice::Error out(_communicator->getLogger());
+            out << "property `IceGrid.Registry.Data' is set to an invalid path:\n" << ex;
+            return false;
         }
     }
 
     _communicator->getProperties()->setProperty("Freeze.DbEnv.Registry.DbHome", dbPath);
-}
 
-void
-FreezeDBPlugin::initialize()
-{
     _connectionPool = new FreezeConnectionPool(_communicator);
-}
 
-void
-FreezeDBPlugin::destroy()
-{
-    _connectionPool = 0;
+    return true;
 }
 
 ConnectionPoolPtr