Ensure bundle gets completed in case of image-build errors

Author: olpaw

substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java

@@ -1581,7 +1581,10 @@ private static void performBuild(BuildConfiguration config, Function<BuildConfig
         try {
             build(config, nativeImageProvider);
         } catch (NativeImageError e) {
-            NativeImage.show(System.err::println, "Error: " + e.getMessage());
+            String message = e.getMessage();
+            if (message != null) {
+                NativeImage.show(System.err::println, "Error: " + message);
+            }
             Throwable cause = e.getCause();
             while (cause != null) {
                 NativeImage.show(System.err::println, "Caused by: " + cause);
@@ -1617,8 +1620,7 @@ protected static void build(BuildConfiguration config, Function<BuildConfigurati
                         break;
                     case BUILDER_ERROR:
                         /* Exit, builder has handled error reporting. */
-                        System.exit(exitStatusCode);
-                        break;
+                        throw showError(null, null, exitStatusCode);
                     case FALLBACK_IMAGE:
                         nativeImage.showMessage("Generating fallback image...");
                         build(new FallbackBuildConfiguration(nativeImage), nativeImageProvider);
@@ -1629,8 +1631,7 @@ protected static void build(BuildConfiguration config, Function<BuildConfigurati
                         break;
                     case OUT_OF_MEMORY:
                         nativeImage.showOutOfMemoryWarning();
-                        System.exit(exitStatusCode);
-                        break;
+                        throw showError(null, null, exitStatusCode);
                     default:
                         String message = String.format("Image build request for '%s' (pid: %d, path: %s) failed with exit status %d",
                                         nativeImage.imageName, nativeImage.imageBuilderPid, nativeImage.imagePath, exitStatusCode);