Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan E. Cook2017-02-22 16:10:07 +0000
committerMorgan E. Cook2017-02-28 00:11:11 +0000
commitc45f7f27b5fe846b7373713bfe111698959e161c (patch)
treec1ccf60384a8375ba479622e8f941ce9920c9d50
parent83b53e1b042abd602f7b2d36ea200bef26a085a2 (diff)
downloadorg.eclipse.osee-0.24.4.v201702280023-REL.tar.gz
org.eclipse.osee-0.24.4.v201702280023-REL.tar.xz
org.eclipse.osee-0.24.4.v201702280023-REL.zip
bug[ats_ATS349133]: Update ArtifactRemoteEventHandler applic call0.24.4.v201702280023-REL
Change-Id: I0a8c909bb6e6bc79d91012a12a65acca5e24ea97 Signed-off-by: Morgan E. Cook <Morgan.e.cook@boeing.com>
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactRemoteEventHandler.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactRemoteEventHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactRemoteEventHandler.java
index ce1cff7f3fe..611660bff05 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactRemoteEventHandler.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactRemoteEventHandler.java
@@ -193,14 +193,11 @@ public class ArtifactRemoteEventHandler implements EventHandlerRemote<RemotePers
RelationEventType eventType = guidArt.getModType();
switch (eventType) {
case Added:
- if (relation == null) {
+ if (relation == null || relation.getModificationType() == ModificationType.DELETED || relation.getModificationType() == ModificationType.ARTIFACT_DELETED) {
+ ApplicabilityId appId = relation == null ? ApplicabilityId.BASE : relation.getApplicabilityId();
relation = RelationManager.getOrCreate(guidArt.getArtAId(), guidArt.getArtBId(), branch,
relationType, guidArt.getRelationId(), guidArt.getGammaId(), guidArt.getRationale(),
- ModificationType.NEW, ApplicabilityId.BASE);
- } else if (relation.getModificationType() == ModificationType.DELETED || relation.getModificationType() == ModificationType.ARTIFACT_DELETED) {
- relation = RelationManager.getOrCreate(guidArt.getArtAId(), guidArt.getArtBId(), branch,
- relationType, guidArt.getRelationId(), guidArt.getGammaId(), guidArt.getRationale(),
- ModificationType.NEW, relation.getApplicabilityId());
+ ModificationType.NEW, appId);
}
break;
case ModifiedRationale:

Back to the top