commit c45f7f27b5fe846b7373713bfe111698959e161c
author Morgan E. Cook <Morgan.e.cook@boeing.com> Wed Feb 22 09:10:07 2017 -0700
committer Morgan E. Cook <Morgan.e.cook@boeing.com> Mon Feb 27 17:11:11 2017 -0700
tree c1ccf60384a8375ba479622e8f941ce9920c9d50
parent 83b53e1b042abd602f7b2d36ea200bef26a085a2

bug[ats_ATS349133]: Update ArtifactRemoteEventHandler applic call

Change-Id: I0a8c909bb6e6bc79d91012a12a65acca5e24ea97
Signed-off-by: Morgan E. Cook <Morgan.e.cook@boeing.com>

plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactRemoteEventHandler.java

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 ce1cff7..611660b 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 @@
                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: