Changeset 5316 for source/ariba/utility/configuration

Timestamp:

Jul 24, 2009, 8:53:41 PM (15 years ago)

Author:

Christoph Mayer

Message:

merge from bootstrap branch

Location:

source/ariba/utility/configuration

Files:

• Configuration.cpp (modified) (2 diffs)
• Configuration.h (modified) (1 diff)

source/ariba/utility/configuration/Configuration.cpp

@@ -51 +51 @@
 void Configuration::setConfigFilename(string filename){
         CONFIG_FILE = filename;
-        instance().reload();
+        if(haveConfig())
+                instance().reload();
 }
 
 Configuration::~Configuration(){
         delete config;
+}
+
+bool Configuration::haveConfig(){
+        std::ifstream in( CONFIG_FILE.c_str() );
+        if( !in ) return false;
+
+        in.close();
+        return true;
 }
 
@@ -64 +73 @@
 
 bool Configuration::exists(const string& name){
+        if(config == NULL) return false;
         return config->keyExists( name );
 }

source/ariba/utility/configuration/Configuration.h

@@ -63 +63 @@
         static Configuration& instance();
         static void setConfigFilename(string filename);
+        static bool haveConfig();
 
         /**