Changeset 20482 for gli

Timestamp:

2009-09-02T17:06:59+12:00 (15 years ago)

Author:

ak19

Message:

Small correction: before prepending cmd start to the command of the script that is to be launched, need to check not just that we're on Windows but also that we're dealing with the apache web server (not persistentServer) and not server.exe.

File:

• gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java (modified) (2 diffs)

gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java

@@ -232 +232 @@
     // Spawn local library server process
     String local_library_server_command = local_library_server_file.getAbsolutePath() + getExtraLaunchArguments(llssite_cfg_file);
-    if(Utility.isWindows()) {
+    if(Utility.isWindows() && !isPersistentServer) { // launching gs2-server.bat (Windows) needs cmd start
         local_library_server_command = "cmd.exe /c start \"GSI\" " + local_library_server_command;
     }
@@ -488 +488 @@
         running = false;
         String local_library_server_command = local_library_server_file.getAbsolutePath() + getExtraLaunchArguments(llssite_cfg_file);
-        if(Utility.isWindows()) {
+        if(Utility.isWindows() && !isPersistentServer) { // launching gs2-server.bat (Windows) needs cmd start
             local_library_server_command = "cmd.exe /c start \"GSI\" " + local_library_server_command;
         }