diff options
| author | Laurent Goubet | 2016-05-23 09:42:44 +0000 |
|---|---|---|
| committer | Laurent Goubet | 2016-05-24 09:18:23 +0000 |
| commit | 83effd5da77e78cd71d71a2739eea2a57c3cbb04 (patch) | |
| tree | 6c0668b96024900f63032105f9bc00c0a266ffbe | |
| parent | b180c9095799637c027227c241ebac6f757d68d3 (diff) | |
| download | org.eclipse.emf.compare-83effd5da77e78cd71d71a2739eea2a57c3cbb04.tar.gz org.eclipse.emf.compare-83effd5da77e78cd71d71a2739eea2a57c3cbb04.tar.xz org.eclipse.emf.compare-83effd5da77e78cd71d71a2739eea2a57c3cbb04.zip | |
[471157] StackOverflow still present on some Sirius diagrams
Bug: 471157
Change-Id: Id1b4920180d612e4f6ebcd6d64503995b27fb39d
| -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); } } } |