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 C9A5D11F35 for ; Wed, 17 Sep 2014 17:32:04 +0000 (UTC) Received: (qmail 67457 invoked by uid 500); 17 Sep 2014 17:32:04 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 67339 invoked by uid 500); 17 Sep 2014 17:32:04 -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 67320 invoked by uid 99); 17 Sep 2014 17:32:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Sep 2014 17:32:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4430EA18E38; Wed, 17 Sep 2014 17:32:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chathuri@apache.org To: commits@airavata.apache.org Date: Wed, 17 Sep 2014 17:32:04 -0000 Message-Id: <8c17884356d54b07a8330c486dce44b1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: fixing erroneous condition Repository: airavata Updated Branches: refs/heads/master d7bb14051 -> 024fc5d77 fixing erroneous condition Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5df1c048 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5df1c048 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5df1c048 Branch: refs/heads/master Commit: 5df1c0484f1b6ca7debfb94331c62661cb58e0fc Parents: 17e8fd3 Author: chathuriw Authored: Wed Sep 17 13:26:42 2014 -0400 Committer: Chathuri Wimalasena Committed: Wed Sep 17 13:26:42 2014 -0400 ---------------------------------------------------------------------- .../application/catalog/data/impl/ComputeResourceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/5df1c048/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java index 5b55556..9104e41 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java @@ -38,7 +38,7 @@ public class ComputeResourceImpl implements ComputeResource { @Override public String addComputeResource(ComputeResourceDescription description) throws AppCatalogException { try { - if (!description.getComputeResourceId().equals("") || !description.getComputeResourceId().equals(computeResourceModelConstants.DEFAULT_ID)){ + if (description.getComputeResourceId().equals("") || description.getComputeResourceId().equals(computeResourceModelConstants.DEFAULT_ID)){ description.setComputeResourceId(AppCatalogUtils.getID(description.getHostName())); } return saveComputeResourceDescriptorData(description);