Return-Path: X-Original-To: apmail-falcon-commits-archive@minotaur.apache.org Delivered-To: apmail-falcon-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D390417C67 for ; Thu, 20 Aug 2015 09:42:45 +0000 (UTC) Received: (qmail 85531 invoked by uid 500); 20 Aug 2015 09:42:42 -0000 Delivered-To: apmail-falcon-commits-archive@falcon.apache.org Received: (qmail 85489 invoked by uid 500); 20 Aug 2015 09:42:42 -0000 Mailing-List: contact commits-help@falcon.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@falcon.apache.org Delivered-To: mailing list commits@falcon.apache.org Received: (qmail 85480 invoked by uid 99); 20 Aug 2015 09:42:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Aug 2015 09:42:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8D1DBE7DCA; Thu, 20 Aug 2015 09:42:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ajayyadava@apache.org To: commits@falcon.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: falcon git commit: FALCON-1409 Update API throws NullPointerException. Contributed by Sandeep Samudrala. Date: Thu, 20 Aug 2015 09:42:42 +0000 (UTC) Repository: falcon Updated Branches: refs/heads/master 5dbcec155 -> 794f93087 FALCON-1409 Update API throws NullPointerException. Contributed by Sandeep Samudrala. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/794f9308 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/794f9308 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/794f9308 Branch: refs/heads/master Commit: 794f930873650fd423e99c3038f0088ac9984274 Parents: 5dbcec1 Author: Ajay Yadava Authored: Thu Aug 20 14:52:09 2015 +0530 Committer: Ajay Yadava Committed: Thu Aug 20 14:52:09 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../resource/proxy/SchedulableEntityManagerProxy.java | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/794f9308/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 15ee65a..2a1d0a6 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -89,6 +89,8 @@ Trunk (Unreleased) (Suhas Vasu) BUG FIXES + FALCON-1409 Update API throws NullPointerException(Sandeep Samudrala via Ajay Yadava) + FALCON-1407 Temporarily disable failing tests in ClusterEntityValidationIT(Ajay Yadava) FALCON-1392 FalconUnit tests fail(Pavan Kumar Kolamuri via Ajay Yadava) http://git-wip-us.apache.org/repos/asf/falcon/blob/794f9308/prism/src/main/java/org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java b/prism/src/main/java/org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java index aa7fd0c..d22e8a3 100644 --- a/prism/src/main/java/org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java +++ b/prism/src/main/java/org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java @@ -257,6 +257,7 @@ public class SchedulableEntityManagerProxy extends AbstractSchedulableEntityMana oldColos.removeAll(mergedColos); //Old colos where delete should be called Map results = new HashMap(); + boolean result = true; if (!oldColos.isEmpty()) { results.put(FALCON_TAG + "/delete", new EntityProxy(type, entityName) { @Override @@ -299,8 +300,14 @@ public class SchedulableEntityManagerProxy extends AbstractSchedulableEntityMana }.execute()); } + for (APIResult apiResult : results.values()) { + if (apiResult.getStatus() != APIResult.Status.SUCCEEDED) { + result = false; + } + } + // update only if all are updated - if (!embeddedMode && results.get(FALCON_TAG).getStatus() == APIResult.Status.SUCCEEDED) { + if (!embeddedMode && result) { results.put(PRISM_TAG, super.update(bufferedRequest, type, entityName, currentColo)); }