Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D7CA7200B7D for ; Fri, 26 Aug 2016 17:42:59 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D6C02160AD6; Fri, 26 Aug 2016 15:42:59 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B9EFA160AD2 for ; Fri, 26 Aug 2016 17:42:58 +0200 (CEST) Received: (qmail 17573 invoked by uid 500); 26 Aug 2016 15:42:57 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 16793 invoked by uid 99); 26 Aug 2016 15:42:57 -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; Fri, 26 Aug 2016 15:42:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 50807E0BDB; Fri, 26 Aug 2016 15:42:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lahiru@apache.org To: commits@airavata.apache.org Date: Fri, 26 Aug 2016 15:43:26 -0000 Message-Id: In-Reply-To: <90c724ae638749f8b9f3701a4687b75c@git.apache.org> References: <90c724ae638749f8b9f3701a4687b75c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/50] [abbrv] airavata git commit: Fixed NPE with experiment cancellation archived-at: Fri, 26 Aug 2016 15:43:00 -0000 Fixed NPE with experiment cancellation Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b284167d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b284167d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b284167d Branch: refs/heads/lahiru/AIRAVATA-2057 Commit: b284167d29172e28cff71575d82731a124ce4c4d Parents: 309a9ff Author: Shameera Rathnayaka Authored: Tue Aug 16 16:25:29 2016 -0400 Committer: Shameera Rathnayaka Committed: Tue Aug 16 16:25:29 2016 -0400 ---------------------------------------------------------------------- .../airavata/api/server/handler/AiravataServerHandler.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/b284167d/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java index e489b43..b21be18 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java @@ -1454,16 +1454,15 @@ public class AiravataServerHandler implements Airavata.Iface { logger.error(airavataExperimentId, "Error while cancelling experiment {}, experiment doesn't exist.", airavataExperimentId); throw new ExperimentNotFoundException("Requested experiment id " + airavataExperimentId + " does not exist in the system.."); } - ExperimentStatus experimentStatus = null; - switch (experimentStatus.getState()) { + switch (existingExperiment.getExperimentStatus().getState()) { case COMPLETED: case CANCELED: case FAILED: case CANCELING: - logger.warn("Can't terminate already {} experiment", experimentStatus.getState().name()); + logger.warn("Can't terminate already {} experiment", existingExperiment.getExperimentStatus().getState().name()); break; case CREATED: logger.warn("Experiment termination is only allowed for launched experiments."); break; default: - submitCancelExperiment(airavataExperimentId, gatewayId); + submitCancelExperiment(gatewayId, airavataExperimentId); logger.debug("Airavata cancelled experiment with experiment id : " + airavataExperimentId); break; }