diff options
| author | Laurent Goubet | 2016-05-23 09:42:44 +0000 |
|---|---|---|
| committer | Laurent Goubet | 2016-05-24 09:11:26 +0000 |
| commit | 66e4caf9dcfa5d2438c62bbc25c4393103f8c1a8 (patch) | |
| tree | db725b9945083f8cbb8ef072e2cfcd41e7c8180e /plugins/org.eclipse.emf.compare.rcp.ui/src/org | |
| parent | cc727ea40711b293accea0337cfc32272151cd36 (diff) | |
| download | org.eclipse.emf.compare-66e4caf9dcfa5d2438c62bbc25c4393103f8c1a8.tar.gz org.eclipse.emf.compare-66e4caf9dcfa5d2438c62bbc25c4393103f8c1a8.tar.xz org.eclipse.emf.compare-66e4caf9dcfa5d2438c62bbc25c4393103f8c1a8.zip | |
[471157] StackOverflow still present on Sirius diagrams
Bug: 471157
Change-Id: Id1b4920180d612e4f6ebcd6d64503995b27fb39d
Diffstat (limited to 'plugins/org.eclipse.emf.compare.rcp.ui/src/org')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ThreeWayComparisonGroupProvider.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ThreeWayComparisonGroupProvider.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ThreeWayComparisonGroupProvider.java index 1374001b2..3ef345ec3 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ThreeWayComparisonGroupProvider.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ThreeWayComparisonGroupProvider.java @@ -200,9 +200,8 @@ public class ThreeWayComparisonGroupProvider extends AbstractDifferenceGroupProv alreadyProcessedMatches.add(match); for (Diff refinedBy : diff.getRefinedBy()) { Match refinedByMatch = refinedBy.getMatch(); - if (!alreadyProcessedMatches.contains(refinedByMatch)) { + if (alreadyProcessedMatches.add(refinedByMatch)) { buildSubTree(wrap, conflict, refinedByMatch, alreadyProcessedMatches); - alreadyProcessedMatches.add(refinedByMatch); } } } |