diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/BranchCache.java')
-rw-r--r-- | plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/BranchCache.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/BranchCache.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/BranchCache.java index 6b4d701cf19..a885df672b6 100644 --- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/BranchCache.java +++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/BranchCache.java @@ -15,7 +15,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.enums.OseeCacheEnum; import org.eclipse.osee.framework.core.enums.TransactionVersion; import org.eclipse.osee.framework.core.model.Branch; @@ -44,7 +43,8 @@ public class BranchCache extends AbstractOseeLoadingCache<Long, Branch> { for (Branch branch : getAll()) { if (branch instanceof MergeBranch) { MergeBranch mergeBranch = (MergeBranch) branch; - if (sourceBranch.equals(mergeBranch.getSourceBranch()) && destinationBranch.equals(mergeBranch.getDestinationBranch())) { + if (sourceBranch.equals(mergeBranch.getSourceBranch()) && destinationBranch.equals( + mergeBranch.getDestinationBranch())) { toReturn = mergeBranch; break; } |