From e1e87440527dd2564bf9f40b34cb961216e7b944 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Wed, 11 Sep 2013 21:48:43 -0700 Subject: [PATCH] Fix empty Config paths for unit test --- src/ripple_core/functional/Config.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/ripple_core/functional/Config.cpp b/src/ripple_core/functional/Config.cpp index 75a88acbd9..674ee932eb 100644 --- a/src/ripple_core/functional/Config.cpp +++ b/src/ripple_core/functional/Config.cpp @@ -714,17 +714,26 @@ File Config::findConfigFile (String commandLineLocation, bool forTestNetwork) File Config::getConfigDir () const { - return File (String (CONFIG_FILE.native ().c_str ())).getParentDirectory (); + String const s (CONFIG_FILE.native().c_str ()); + if (s.isNotEmpty ()) + return File (s).getParentDirectory (); + return File::nonexistent (); } File Config::getDatabaseDir () const { - return File (String (DATA_DIR.native ().c_str ())); + String const s (DATA_DIR.native().c_str()); + if (s.isNotEmpty ()) + return File (s); + return File::nonexistent (); } File Config::getValidatorsFile () const { - return getConfigDir().getChildFile (String (VALIDATORS_FILE.native().c_str())); + String const s (VALIDATORS_FILE.native().c_str()); + if (s.isNotEmpty() && getConfigDir() != File::nonexistent()) + return getConfigDir().getChildFile (s); + return File::nonexistent (); } UniformResourceLocator Config::getValidatorsURL () const