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 A069A20049E for ; Thu, 10 Aug 2017 20:16:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9E91F16BD76; Thu, 10 Aug 2017 18:16:50 +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 E572216BD75 for ; Thu, 10 Aug 2017 20:16:49 +0200 (CEST) Received: (qmail 58551 invoked by uid 500); 10 Aug 2017 18:16:48 -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 58540 invoked by uid 99); 10 Aug 2017 18:16:48 -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, 10 Aug 2017 18:16:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 163BBF16BB; Thu, 10 Aug 2017 18:16:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Message-Id: <7e652fd2087b4f97aab419d7dc184e24@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: airavata git commit: fixing bug in initializing user profile in the sharing db event handler Date: Thu, 10 Aug 2017 18:16:47 +0000 (UTC) archived-at: Thu, 10 Aug 2017 18:16:50 -0000 Repository: airavata Updated Branches: refs/heads/develop b182ca18a -> efa619b78 fixing bug in initializing user profile in the sharing db event handler Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/efa619b7 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/efa619b7 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/efa619b7 Branch: refs/heads/develop Commit: efa619b78020e0a66140b3636f7c3f6d1c5706a3 Parents: b182ca1 Author: scnakandala Authored: Thu Aug 10 14:16:42 2017 -0400 Committer: scnakandala Committed: Thu Aug 10 14:16:42 2017 -0400 ---------------------------------------------------------------------- .../sharing/registry/messaging/SharingServiceDBEventHandler.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/efa619b7/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java index cb9819f..61dfe4e 100644 --- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java +++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java @@ -80,12 +80,11 @@ public class SharingServiceDBEventHandler implements MessageHandler { log.info("User profile specific DB Event communicated by " + dbEventMessage.getPublisherService()); UserProfile userProfile = new UserProfile(); + ThriftUtils.createThriftFromBytes(dBEventMessageContext.getPublisher().getPublisherContext().getEntityDataModel(), userProfile); //AIRAVATA-2506: Sharing Service treats airavataInternalUserId as the userId. AiravataAPIServerHandler //also treats airavataInternalUserId as the userId when creating entities, entityTypes using the sharing //service. userProfile.setUserId(userProfile.getAiravataInternalUserId()); - ThriftUtils.createThriftFromBytes(dBEventMessageContext.getPublisher().getPublisherContext().getEntityDataModel(), userProfile); - User user = ThriftDataModelConversion.getUser(userProfile); switch (dBEventMessageContext.getPublisher().getPublisherContext().getCrudType()){