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 <supun.nakand...@gmail.com>
Authored: Thu Aug 10 14:16:42 2017 -0400
Committer: scnakandala <supun.nakand...@gmail.com>
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()){

Reply via email to