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 0E612200CD9 for ; Thu, 3 Aug 2017 18:01:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0D01916BDEC; Thu, 3 Aug 2017 16:01:23 +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 19CD916BDED for ; Thu, 3 Aug 2017 18:01:20 +0200 (CEST) Received: (qmail 1149 invoked by uid 500); 3 Aug 2017 16:01:19 -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 99621 invoked by uid 99); 3 Aug 2017 16:01:18 -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, 03 Aug 2017 16:01:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D7F70F555E; Thu, 3 Aug 2017 16:01:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: machristie@apache.org To: commits@airavata.apache.org Date: Thu, 03 Aug 2017 16:01:40 -0000 Message-Id: <32d8754ee5c545b79f74cad36189348f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [24/50] [abbrv] airavata git commit: Sharing DOMAIN has DOMAIN_ID that is the same as GATEWAY_ID archived-at: Thu, 03 Aug 2017 16:01:23 -0000 Sharing DOMAIN has DOMAIN_ID that is the same as GATEWAY_ID Not sure why the DOMAIN_ID was getting overwritten with the domain name. Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/aff5156c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/aff5156c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/aff5156c Branch: refs/heads/master Commit: aff5156c2a83214c58819c7db42a3ee7d804f086 Parents: 1463341 Author: Marcus Christie Authored: Tue Jul 11 19:00:38 2017 -0500 Committer: Marcus Christie Committed: Tue Jul 11 19:00:38 2017 -0500 ---------------------------------------------------------------------- .../sharing/registry/server/SharingRegistryServerHandler.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/aff5156c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java index 722157e..819dd16 100644 --- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java +++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java @@ -51,7 +51,6 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac @Override public String createDomain(Domain domain) throws SharingRegistryException, DuplicateEntryException, TException { try{ - domain.setDomainId(domain.name); if((new DomainRepository()).get(domain.domainId) != null) throw new DuplicateEntryException("There exist domain with given domain id");