Changeset 28990 for main/trunk/greenstone2/common-src/src

Timestamp:

2014-04-17T14:47:42+12:00 (10 years ago)

Author:

ak19

Message:

Improvement to commit of revision 28979: Dr Bainbridge suggested that we only set JAVA_HOME if it's not already set to the same value.

File:

• main/trunk/greenstone2/common-src/src/lib/gsdlsitecfg.cpp (modified) (2 diffs)

main/trunk/greenstone2/common-src/src/lib/gsdlsitecfg.cpp

@@ -139 +139 @@
 
       text_t javahome(cfgline[0]);
+      text_t oldjavahome = "";
 
       // getenv returns NULL if not set, http://www.cplusplus.com/reference/cstdlib/getenv/
@@ -145 +146 @@
 
       if(existing_javahome != NULL) {
-    // cerr goes to: apache-httpd/<OS>/logs/error_log
-    cerr << "Warning: JAVA_HOME is already set to: " << existing_javahome << endl;
-    cerr << "But overwriting with javahome set in gsdlsite.cfg: " << javahome << endl;  
-      }
-
-      // http://www.kev.pulo.com.au/pp/RESOURCES/cplusplus/ref/cstdlib/putenv.html
-      // putenv is not defined in ANSI-C, but is supported by many compilers, and is 
-      // already used in gtiaction.cpp
-      javahome = "JAVA_HOME=" + javahome;
-      char* set_javahome_cstr = javahome.getcstr();
-      putenv(set_javahome_cstr);
-
-      // can't use locally declared char array that we string-copy the cstr into, 
-      // since the array's value expires from putenv, possibly after this function's local scope
-      // Forced to assign the dynamically allocated cstr and resist the urge to delete this:
-      //delete[] set_javahome_cstr; // may not delete it, else the env var just set will become empty      
-    }    
+    oldjavahome += existing_javahome;
+    if(javahome != oldjavahome) {
+      // cerr goes to: apache-httpd/<OS>/logs/error_log
+      cerr << "Warning: JAVA_HOME is already set to: " << existing_javahome << endl;
+      cerr << "But overwriting with javahome set in gsdlsite.cfg: " << javahome << endl;    
+    } else {
+      cerr << "JAVA_HOME (" << oldjavahome << ") already set to " + javahome << endl;
+    }
+      }
+
+      if(javahome != oldjavahome) {
+    // http://www.kev.pulo.com.au/pp/RESOURCES/cplusplus/ref/cstdlib/putenv.html
+    // putenv is not defined in ANSI-C, but is supported by many compilers, and is 
+    // already used in gtiaction.cpp
+    javahome = "JAVA_HOME=" + javahome;
+    char* set_javahome_cstr = javahome.getcstr();
+    putenv(set_javahome_cstr);
+    
+    // can't use locally declared char array that we string-copy the cstr into, 
+    // since the array's value expires from putenv, possibly after this function's local scope
+    // Forced to assign the dynamically allocated cstr and resist the urge to delete this:
+    //delete[] set_javahome_cstr; // may not delete it, else the env var just set will become empty      
+      }    
+    }
 
     if (actions != NULL && key == "actions") {