Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9814418A97 for ; Sat, 23 Apr 2016 02:00:14 +0000 (UTC) Received: (qmail 83972 invoked by uid 500); 23 Apr 2016 02:00:14 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 83873 invoked by uid 500); 23 Apr 2016 02:00:14 -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 83332 invoked by uid 99); 23 Apr 2016 02:00:13 -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; Sat, 23 Apr 2016 02:00:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 950E0E9E9A; Sat, 23 Apr 2016 02:00:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Date: Sat, 23 Apr 2016 02:00:22 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/35] airavata git commit: Fixed NPE with scratch location Fixed NPE with scratch location Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/662728b4 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/662728b4 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/662728b4 Branch: refs/heads/master Commit: 662728b4a3e74b24bd0a6437d7759c4235754dff Parents: 2536b33 Author: Shameera Rathnayaka Authored: Tue Apr 5 16:29:00 2016 -0400 Committer: Shameera Rathnayaka Committed: Tue Apr 5 16:29:00 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/airavata/gfac/core/context/ProcessContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/662728b4/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java index 3951216..45e7b94 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java @@ -169,7 +169,7 @@ public class ProcessContext { }else { String scratchLocation = null; String overrideScratchLocation = processModel.getResourceSchedule().getOverrideScratchLocation(); - if (overrideScratchLocation != null || !overrideScratchLocation.equals("")) { + if (overrideScratchLocation != null && !overrideScratchLocation.equals("")) { scratchLocation = overrideScratchLocation; } else { scratchLocation = computeResourcePreference.getScratchLocation();