Repository: falcon Updated Branches: refs/heads/0.9 68efaed58 -> 25347c0e0
FALCON-1735 FalconException shouldn't be caught in AbstractRerunHandler in case of obtaining Workflow engine from entity. Contributed by Pavan Kumar Kolamuri. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/409ebffe Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/409ebffe Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/409ebffe Branch: refs/heads/0.9 Commit: 409ebffe6b27e2cd74be8b6ec13f440b6c864dd9 Parents: 68efaed Author: Ajay Yadava <[email protected]> Authored: Mon Jan 11 17:31:01 2016 +0530 Committer: Ajay Yadava <[email protected]> Committed: Mon Jan 11 18:09:31 2016 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../falcon/rerun/handler/AbstractRerunHandler.java | 12 ++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/409ebffe/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b7f2d22..d525dc8 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -96,6 +96,8 @@ Proposed Release Version: 0.9 OPTIMIZATIONS BUG FIXES + FALCON-1735 FalconException shouldn't be caught in AbstractRerunHandler in case of obtaining Workflow engine from entity(Pavan Kumar Kolamuri via Ajay Yadava) + FALCON-1678 SLA Monitoring does not honour entity end date(Ajay Yadava) FALCON-1708 params API does not take start as a mandatory option(Praveen Adlakha via Ajay Yadava) http://git-wip-us.apache.org/repos/asf/falcon/blob/409ebffe/rerun/src/main/java/org/apache/falcon/rerun/handler/AbstractRerunHandler.java ---------------------------------------------------------------------- diff --git a/rerun/src/main/java/org/apache/falcon/rerun/handler/AbstractRerunHandler.java b/rerun/src/main/java/org/apache/falcon/rerun/handler/AbstractRerunHandler.java index bc1f7f2..3ec3617 100644 --- a/rerun/src/main/java/org/apache/falcon/rerun/handler/AbstractRerunHandler.java +++ b/rerun/src/main/java/org/apache/falcon/rerun/handler/AbstractRerunHandler.java @@ -60,17 +60,13 @@ public abstract class AbstractRerunHandler<T extends RerunEvent, M extends Delay String wfId, String workflowUser, long msgReceivedTime); //RESUME CHECKSTYLE CHECK ParameterNumberCheck - public AbstractWorkflowEngine getWfEngine(String entityType, String entityName) { + public AbstractWorkflowEngine getWfEngine(String entityType, String entityName) throws FalconException { if (StringUtils.isBlank(entityType) || StringUtils.isBlank(entityName)) { return wfEngine; } - try { - Entity entity = EntityUtil.getEntity(EntityType.valueOf(entityType), entityName); - return WorkflowEngineFactory.getWorkflowEngine(entity); - } catch (FalconException e) { - // Just to make sure of backward compatibility in case of any exceptions. - return wfEngine; - } + Entity entity = EntityUtil.getEntity(EntityType.valueOf(entityType), entityName); + return WorkflowEngineFactory.getWorkflowEngine(entity); + } public boolean offerToQueue(T event) throws FalconException {
