feature[ats_ATS19845]: Fix server decoding merge branch update message

Change-Id: Id5a093873fd97e71aaa74af5e9a5dc1a56883d58

2 files changed, 18 insertions, 1 deletions

diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java
index 4bf99190f23..df3ff38c4c2 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java
@@ -182,7 +182,7 @@ public final class BranchCacheUpdateUtil {
       TranslationUtil.loadMap(message.getBranchToSourceTx(), store, Fields.BRANCH_TO_SRC_TX);
       TranslationUtil.loadMap(message.getBranchToAssocArt(), store, Fields.BRANCH_TO_ASSOC_ART);
       TranslationUtil.loadArrayMap(message.getBranchAliases(), store, Fields.BRANCH_TO_ALIASES);
-      TranslationUtil.loadTripletList(message.getMergeBranches(), store, Fields.SRC_DEST_MERGE);
+      TranslationUtil.loadTripletListForMergeBranches(message.getMergeBranches(), store, Fields.SRC_DEST_MERGE);
    }
 
    public static void loadStore(PropertyStore store, AbstractBranchCacheMessage message) {
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/TranslationUtil.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/TranslationUtil.java
index 3e7bc8390f4..c551f2953eb 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/TranslationUtil.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/TranslationUtil.java
@@ -53,6 +53,10 @@ public final class TranslationUtil {
       storeToStringTripletList(data, store.getPropertyStore(key.name()));
    }
 
+   public static void loadTripletListForMergeBranches(List<Triplet<Long, Long, Long>> data, PropertyStore store, Enum<?> key) {
+      storeToStringTripletListForMergeBranches(data, store.getPropertyStore(key.name()));
+   }
+
    public static void loadTripletLongList(List<Triplet<Long, Long, Long>> data, PropertyStore store, Enum<?> key) {
       storeToTripletList(data, store.getPropertyStore(key.name()));
    }
@@ -164,6 +168,19 @@ public final class TranslationUtil {
       }
    }
 
+   private static void storeToStringTripletListForMergeBranches(List<Triplet<Long, Long, Long>> data, PropertyStore innerStore) {
+      for (String strKey : innerStore.arrayKeySet()) {
+         String[] value = innerStore.getArray(strKey);
+         if (BranchRow.isOseeUsingGuidsForAppServerMessaging()) {
+            data.add(new Triplet<Long, Long, Long>(BranchRow.getBranchIdLegacy(value[0]),
+               BranchRow.getBranchIdLegacy(value[1]), BranchRow.getBranchIdLegacy(value[2])));
+         } else {
+            data.add(new Triplet<Long, Long, Long>(Long.valueOf(value[0]), Long.valueOf(value[1]),
+               Long.valueOf(value[2])));
+         }
+      }
+   }
+
    private static PropertyStore tripletListToStore(List<Triplet<Long, Long, Long>> list) {
       PropertyStore innerStore = new PropertyStore();
       int index = 0;