Repository: airavata Updated Branches: refs/heads/develop 33a601fe8 -> 14633418a
May not get Gateway CREATE event so add DOMAIN on UPDATE if not exists Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/14633418 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/14633418 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/14633418 Branch: refs/heads/develop Commit: 14633418a45d80a793fa05d6c381b4ae7e386adc Parents: 33a601f Author: Marcus Christie <[email protected]> Authored: Tue Jul 11 18:02:44 2017 -0500 Committer: Marcus Christie <[email protected]> Committed: Tue Jul 11 18:02:44 2017 -0500 ---------------------------------------------------------------------- .../registry/messaging/SharingServiceDBEventHandler.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/14633418/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 2a28b8d..29f4ee0 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 @@ -28,7 +28,6 @@ import org.apache.airavata.messaging.core.MessageContext; import org.apache.airavata.messaging.core.MessageHandler; import org.apache.airavata.model.dbevent.DBEventMessage; import org.apache.airavata.model.dbevent.DBEventMessageContext; -import org.apache.airavata.model.dbevent.EntityType; import org.apache.airavata.model.error.DuplicateEntryException; import org.apache.airavata.model.user.UserProfile; import org.apache.airavata.model.workspace.Gateway; @@ -127,6 +126,12 @@ public class SharingServiceDBEventHandler implements MessageHandler { switch (dBEventMessageContext.getPublisher().getPublisherContext().getCrudType()){ case CREATE: + case UPDATE: + + // Only create the domain is it doesn't already exist + if (sharingRegistryClient.isDomainExists(gateway.getGatewayId())){ + break; + } /* Following set of DB operations should happen in a transaction As these are thrift calls we cannot enforce this restriction
