[cpp-sp COMMIT] /branches/REL_2/shibsp/SPConfig.cpp

[noreply at shibboleth.net]

Author: scantor
Date: Wed May  2 02:25:49 2012
New Revision: 3636

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3636&view=rev
Log:
Cache directory was not initialized properly.

Modified:
    branches/REL_2/shibsp/SPConfig.cpp

Modified: branches/REL_2/shibsp/SPConfig.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/SPConfig.cpp?rev=3636&r1=3635&r2=3636&view=diff
==============================================================================
--- branches/REL_2/shibsp/SPConfig.cpp (original)
+++ branches/REL_2/shibsp/SPConfig.cpp Wed May  2 02:25:49 2012
@@ -190,7 +190,7 @@
     PathResolver localpr;
     localpr.setDefaultPrefix(inst_prefix2.c_str());
     inst_prefix = getenv("SHIBSP_CFGDIR");
-    if (!inst_prefix)
+    if (!inst_prefix || !*inst_prefix)
         inst_prefix = SHIBSP_CFGDIR;
     localpr.setCfgDir(inst_prefix);
     XMLToolingConfig::getConfig().log_config(localpr.resolve(ll, PathResolver::XMLTOOLING_CFG_FILE, PACKAGE_NAME).c_str());
@@ -240,19 +240,23 @@
     pr->setDefaultPrefix(inst_prefix2.c_str());
     pr->setCfgDir(inst_prefix);
     inst_prefix = getenv("SHIBSP_LIBDIR");
-    if (!inst_prefix)
+    if (!inst_prefix || !*inst_prefix)
         inst_prefix = SHIBSP_LIBDIR;
     pr->setLibDir(inst_prefix);
     inst_prefix = getenv("SHIBSP_LOGDIR");
-    if (!inst_prefix)
+    if (!inst_prefix || !*inst_prefix)
         inst_prefix = SHIBSP_LOGDIR;
     pr->setLogDir(inst_prefix);
     inst_prefix = getenv("SHIBSP_RUNDIR");
-    if (!inst_prefix)
+    if (!inst_prefix || !*inst_prefix)
         inst_prefix = SHIBSP_RUNDIR;
     pr->setRunDir(inst_prefix);
+    inst_prefix = getenv("SHIBSP_CACHEDIR");
+    if (!inst_prefix || !*inst_prefix)
+        inst_prefix = SHIBSP_CACHEDIR;
+    pr->setCacheDir(inst_prefix);
     inst_prefix = getenv("SHIBSP_XMLDIR");
-    if (!inst_prefix)
+    if (!inst_prefix || !*inst_prefix)
         inst_prefix = SHIBSP_XMLDIR;
     pr->setXMLDir(inst_prefix);