Changeset 19766 for release-kits/shared/linux/wrapper.cpp

Timestamp:

2009-06-09T11:30:53+12:00 (15 years ago)

Author:

oranfry

Message:

our full_java function cant exit on failure, must return to allow cleanup to continue

File:

• release-kits/shared/linux/wrapper.cpp (modified) (2 diffs)

release-kits/shared/linux/wrapper.cpp

@@ -179 +179 @@
     #else
         string java_executable = get_full_java( wd );
-        string cmd = java_executable + " -Dorig.dir=\"" + wd + "\" -jar " + wd + "/Java/Jars/linux.jar" + (text_mode?" text":"");
-        system( cmd.c_str() );
+        if ( java_executable != NULL ) {
+            string cmd = java_executable + " -Dorig.dir=\"" + wd + "\" -jar " + wd + "/Java/Jars/linux.jar" + (text_mode?" text":"");
+            system( cmd.c_str() );
+        }
     #endif
 
@@ -268 +270 @@
         cerr << "Unable to run copied Java" << endl;
         system("/bin/rm -rf jre");
-        exit(-1);
+        return NULL;
       }
     }