Changeset 19767

Show
Ignore:
Timestamp:
09.06.2009 11:36:18 (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

    r19766 r19767  
    179179    #else 
    180180        string java_executable = get_full_java( wd ); 
    181         if ( java_executable != NULL ) { 
     181        if ( java_executable != "" ) { 
    182182            string cmd = java_executable + " -Dorig.dir=\"" + wd + "\" -jar " + wd + "/Java/Jars/linux.jar" + (text_mode?" text":""); 
    183183            system( cmd.c_str() ); 
     
    270270        cerr << "Unable to run copied Java" << endl; 
    271271        system("/bin/rm -rf jre"); 
    272         return NULL; 
     272        return ""; 
    273273      } 
    274274    }