You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by di...@apache.org on 2023/04/20 06:23:50 UTC
[oozie] branch master updated: OOZIE-3716 Invocation of Main class completed Message is skipped when LauncherSecurityManager calls system exit (khr9603 via dionusos)
This is an automated email from the ASF dual-hosted git repository.
dionusos pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git
The following commit(s) were added to refs/heads/master by this push:
new d4e36739d OOZIE-3716 Invocation of Main class completed Message is skipped when LauncherSecurityManager calls system exit (khr9603 via dionusos)
d4e36739d is described below
commit d4e36739d798589567ac331b348e8786c876aefa
Author: Denes Bodo <di...@apache.org>
AuthorDate: Thu Apr 20 08:22:42 2023 +0200
OOZIE-3716 Invocation of Main class completed Message is skipped when LauncherSecurityManager calls system exit (khr9603 via dionusos)
---
release-log.txt | 1 +
.../src/main/java/org/apache/oozie/action/hadoop/LauncherAM.java | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/release-log.txt b/release-log.txt
index e3ecb1eab..776aaa8df 100644
--- a/release-log.txt
+++ b/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)
diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherAM.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherAM.java
index bc91959fd..94ba8f7a6 100644
--- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherAM.java
+++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherAM.java
@@ -410,9 +410,6 @@ public class LauncherAM {
// 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 @@ public class LauncherAM {
} finally {
// Disable LauncherSecurityManager
launcherSecurityManager.disable();
+ if (actionMainExecutedProperly) {
+ System.out.println();
+ System.out.println("<<< Invocation of Main class completed <<<");
+ System.out.println();
+ }
}
return actionMainExecutedProperly;
}