OOZIE-3716 Invocation of Main class completed Message is skipped when LauncherSecurityManager calls system exit (khr9603 via dionusos)

Author: Denes Bodo

release-log.txt

@@ -1,5 +1,6 @@
 -- Oozie 5.3.0 release (trunk - unreleased)
 
+OOZIE-3716 Invocation of Main class completed Message is skipped when LauncherSecurityManager calls system exit (khr9603 via dionusos)
 OOZIE-3695 [sharelib-hive2] Fix current SpotBugs discovered issues in Oozie's sharelib-hive2 module (jmakai via dionusos)
 OOZIE-3694 [sharelib-hive] Fix current SpotBugs discovered issues in Oozie's sharelib-hive module (jmakai via dionusos)
 OOZIE-3690 [server] Fix current SpotBugs discovered issues in Oozie's server module (jmakai via dionusos)

sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherAM.java

@@ -410,9 +410,6 @@ private boolean runActionMain(final ErrorHolder eHolder) throws Exception {
             // Enable LauncherSecurityManager to catch System.exit calls
             launcherSecurityManager.enable();
             mainMethod.invoke(null, (Object) mainArgs);
-            System.out.println();
-            System.out.println("<<< Invocation of Main class completed <<<");
-            System.out.println();
             actionMainExecutedProperly = true;
         } catch (InvocationTargetException ex) {
             actionMainExecutedProperly = handleInvocationError(eHolder, ex);
@@ -426,6 +423,11 @@ private boolean runActionMain(final ErrorHolder eHolder) throws Exception {
         } finally {
             // Disable LauncherSecurityManager
             launcherSecurityManager.disable();
+            if (actionMainExecutedProperly) {
+                System.out.println();
+                System.out.println("<<< Invocation of Main class completed <<<");
+                System.out.println();
+            }
         }
         return actionMainExecutedProperly;
     }