Repository: airavata Updated Branches: refs/heads/develop c171c67a4 -> 84e8eef50
fixing AIRAVATA-2506: Treating airavataInternalUserId as the userId for sharing registry service Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/84e8eef5 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/84e8eef5 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/84e8eef5 Branch: refs/heads/develop Commit: 84e8eef50d8c51f4926bb02518d1d5ce0142956f Parents: c171c67 Author: scnakandala <[email protected]> Authored: Tue Aug 8 12:10:23 2017 -0400 Committer: scnakandala <[email protected]> Committed: Tue Aug 8 12:10:23 2017 -0400 ---------------------------------------------------------------------- .../sharing/registry/messaging/SharingServiceDBEventHandler.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/84e8eef5/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 29f4ee0..cb9819f 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,6 +80,10 @@ public class SharingServiceDBEventHandler implements MessageHandler { log.info("User profile specific DB Event communicated by " + dbEventMessage.getPublisherService()); UserProfile userProfile = new 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);
