Repository: oozie Updated Branches: refs/heads/master d5b9e3690 -> a299d4a6d
OOZIE-3297 Retry logic does not handle the exception from BulkJPAExecutor properly (andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/a299d4a6 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/a299d4a6 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/a299d4a6 Branch: refs/heads/master Commit: a299d4a6d435a2c92cd1d0ffce7f35a2ef8d639b Parents: d5b9e36 Author: Andras Piros <[email protected]> Authored: Tue Jul 3 10:01:48 2018 +0200 Committer: Andras Piros <[email protected]> Committed: Tue Jul 3 10:01:48 2018 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/oozie/executor/jpa/BulkJPAExecutor.java | 4 +++- release-log.txt | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/a299d4a6/core/src/main/java/org/apache/oozie/executor/jpa/BulkJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/BulkJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/BulkJPAExecutor.java index d258d85..4296115 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/BulkJPAExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/BulkJPAExecutor.java @@ -31,6 +31,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.persistence.EntityManager; +import javax.persistence.NoResultException; import javax.persistence.Query; import org.apache.oozie.BulkResponseInfo; @@ -130,7 +131,8 @@ public class BulkJPAExecutor implements JPAExecutor<BulkResponseInfo> { List<Object[]> bundleObjs = (List<Object[]>) tmp.getResultList(); if (bundleObjs.isEmpty()) { - throw new JPAExecutorException(ErrorCode.E0603, "No entries found for given bundle(s)"); + final String message = "No entries found for given bundle(s)"; + throw new JPAExecutorException(ErrorCode.E0603, message, new NoResultException(message)); } List<BundleJobBean> bundleBeans = new ArrayList<BundleJobBean>(); http://git-wip-us.apache.org/repos/asf/oozie/blob/a299d4a6/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 5afa261..4fad9a2 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-3297 Retry logic does not handle the exception from BulkJPAExecutor properly (andras.piros) OOZIE-2955 [oozie-client] Fix Findbugs warnings (Jan Hentschel, kmarton via andras.piros) OOZIE-3109 [log-streaming] Escape HTML-specific characters (dionusos via andras.piros) OOZIE-2956 Fix Findbugs warnings related to reliance on default encoding in oozie-core (Jan Hentschel, kmarton via andras.piros)
