Changeset 19766

Show
Ignore:
Timestamp:
09.06.2009 11:30:53 (10 years ago)
Author:
oranfry
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • release-kits/shared/linux/wrapper.cpp

    r19765 r19766  
    179179    #else 
    180180        string java_executable = get_full_java( wd ); 
    181         string cmd = java_executable + " -Dorig.dir=\"" + wd + "\" -jar " + wd + "/Java/Jars/linux.jar" + (text_mode?" text":""); 
    182         system( cmd.c_str() ); 
     181        if ( java_executable != NULL ) { 
     182            string cmd = java_executable + " -Dorig.dir=\"" + wd + "\" -jar " + wd + "/Java/Jars/linux.jar" + (text_mode?" text":""); 
     183            system( cmd.c_str() ); 
     184        } 
    183185    #endif 
    184186 
     
    268270        cerr << "Unable to run copied Java" << endl; 
    269271        system("/bin/rm -rf jre"); 
    270         exit(-1); 
     272        return NULL; 
    271273      } 
    272274    }