Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2014-04-01 16:32:56 -0400
committerDonald Dunne2014-04-14 12:16:33 -0400
commit5c985c690773534ad2356e51d00972a256eb56a8 (patch)
treeee705423049663d9a5dc145ff06a87c070dda621 /plugins/org.eclipse.osee.framework.core.message/src/org
parent62c144f2bb561e870fee87979d13762c7e0306e2 (diff)
downloadorg.eclipse.osee-5c985c690773534ad2356e51d00972a256eb56a8.tar.gz
org.eclipse.osee-5c985c690773534ad2356e51d00972a256eb56a8.tar.xz
org.eclipse.osee-5c985c690773534ad2356e51d00972a256eb56a8.zip
feature[ats_ATS19845]: Convert branch.getGuid calls to branch.getUuid
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.message/src/org')
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java2
1 files changed, 1 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 04017aca0c..59439590f9 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
@@ -157,7 +157,7 @@ public final class BranchCacheUpdateUtil {
Long src = mergeBranch.getSourceBranch() != null ? mergeBranch.getSourceBranch().getGuid() : DEFAULT_UUID;
Long dest =
mergeBranch.getDestinationBranch() != null ? mergeBranch.getDestinationBranch().getGuid() : DEFAULT_UUID;
- Long merge = mergeBranch.getGuid();
+ Long merge = mergeBranch.getUuid();
srcDestMerge.add(new Triplet<Long, Long, Long>(src, dest, merge));
}

Back to the top