Index: trunk/modules/luni/src/main/native/launcher/shared/main.c =================================================================== --- trunk/modules/luni/src/main/native/launcher/shared/main.c (revision 467580) +++ trunk/modules/luni/src/main/native/launcher/shared/main.c (working copy) @@ -123,7 +123,7 @@ int javaRc = 0; char defaultDllName[] = "harmonyvm"; char defaultDirName[] = "default"; - int rc = -1; + int rc = 1; int showVersion = 0; int versionFlag = 0; int genericLauncher = 0; @@ -309,9 +309,7 @@ dirs[0] = newPathToAdd; dirs[1] = exeName; - rc = addDirsToPath(PORTLIB, 2, dirs, argv); - - if (rc == -1) + if (addDirsToPath(PORTLIB, 2, dirs, argv) == -1) { hytty_printf (PORTLIB, "addDirsToPath Failed\n"); goto bail; @@ -358,7 +356,7 @@ (PORTLIB, argc, argv, handle, JNI_VERSION_1_4, JNI_TRUE, mainClass, classArg, propertiesFileName, isStandaloneJar, vmdllsubdir)) { - hytty_printf (PORTLIB, "FAILED to invoke JVM.\n"); + //hytty_printf (PORTLIB, "FAILED to invoke JVM.\n"); goto bail; } @@ -367,6 +365,8 @@ hytty_printf (PORTLIB, "Failed to close JVM DLL: %s\n", argv[1]); goto bail; } + /* application completed successfully */ + rc = 0; bail: if (exeName) { hymem_free_memory (exeName); @@ -385,7 +385,7 @@ hymem_free_memory (newPathToAdd); } - return 0; + return rc; }