You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ba...@apache.org on 2016/08/02 16:36:14 UTC
falcon git commit: FALCON-2107 NPE in
FalconWorkflowEngine::isActive() method
Repository: falcon
Updated Branches:
refs/heads/master c7996deb7 -> 117fdcfe5
FALCON-2107 NPE in FalconWorkflowEngine::isActive() method
Author: bvellanki <bv...@hortonworks.com>
Reviewers: "Venkat Ranganathan <ve...@hortonworks.com>"
Closes #254 from bvellanki/FALCON-2107
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/117fdcfe
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/117fdcfe
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/117fdcfe
Branch: refs/heads/master
Commit: 117fdcfe518154d634060e7557a5efe320e33362
Parents: c7996de
Author: bvellanki <bv...@hortonworks.com>
Authored: Tue Aug 2 09:36:09 2016 -0700
Committer: bvellanki <bv...@hortonworks.com>
Committed: Tue Aug 2 09:36:09 2016 -0700
----------------------------------------------------------------------
.../falcon/workflow/engine/FalconWorkflowEngine.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/117fdcfe/scheduler/src/main/java/org/apache/falcon/workflow/engine/FalconWorkflowEngine.java
----------------------------------------------------------------------
diff --git a/scheduler/src/main/java/org/apache/falcon/workflow/engine/FalconWorkflowEngine.java b/scheduler/src/main/java/org/apache/falcon/workflow/engine/FalconWorkflowEngine.java
index 7b7da0a..fe16443 100644
--- a/scheduler/src/main/java/org/apache/falcon/workflow/engine/FalconWorkflowEngine.java
+++ b/scheduler/src/main/java/org/apache/falcon/workflow/engine/FalconWorkflowEngine.java
@@ -108,12 +108,17 @@ public class FalconWorkflowEngine extends AbstractWorkflowEngine {
@Override
public boolean isActive(Entity entity) throws FalconException {
- EntityID id = new EntityID(entity);
- // Ideally state store should have all entities, but, check anyway.
- if (STATE_STORE.entityExists(id)) {
- return STATE_STORE.getEntity(id).getCurrentState() != EntityState.STATE.SUBMITTED;
+ try {
+ EntityID id = new EntityID(entity);
+ // Ideally state store should have all entities, but, check anyway.
+ if (STATE_STORE.entityExists(id)) {
+ return STATE_STORE.getEntity(id).getCurrentState() != EntityState.STATE.SUBMITTED;
+ }
+ return false;
+ } catch (NullPointerException npe) {
+ // FalconJPAService is not always used, so catch NPE and return false
+ return false;
}
- return false;
}
@Override