Changeset 20918 for greenstone3

Timestamp:

2009-11-09T16:32:12+13:00 (14 years ago)

Author:

ak19

Message:

Changes to previous commits (to handle spaces in filepaths on Windows) so that things still work on Linux

Location:

greenstone3/trunk/src/java/org/greenstone/server

Files:

• BaseServerControl.java (modified) (2 diffs)
• BrowserLauncher.java (modified) (1 diff)

greenstone3/trunk/src/java/org/greenstone/server/BaseServerControl.java

@@ -232 +232 @@
                    break;     
         }
-        case BaseServer.SERVER_STARTED: case BaseServer.BROWSER_LAUNCH_FAILED:
+        case BaseServer.SERVER_STARTED:
         {
          Thread runInThread = new Thread(new Runnable(){
@@ -252 +252 @@
             runInThread.start();
             break;
-        }   
-        case BaseServer.BROWSER_LAUNCHED:
+        }
+        case BaseServer.BROWSER_LAUNCHED: case BaseServer.BROWSER_LAUNCH_FAILED:
         {
             Thread runInThread = new Thread(new Runnable(){

greenstone3/trunk/src/java/org/greenstone/server/BrowserLauncher.java

@@ -122 +122 @@
         logger.info("ExitCode:" + exitCode);
         if (exitCode != 0) { // if trying to launch the browser above failed
-        state = LAUNCHFAILED;
-        logger.error("Failed to launch web browser.");      
+           state = LAUNCHFAILED;
+           logger.error("Failed to launch web browser when running command:");
+           logger.error("\t" + this.command);       
         }
     }