Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdgar Mueller2016-04-27 05:10:20 -0400
committerLaurent Delaigue2016-06-08 09:30:44 -0400
commit814919e9de93aacc099b18fd76dac201e115b465 (patch)
treeda6a400e495e5f7a5146db40b3eb5788e0a4041e /plugins/org.eclipse.emf.compare.uml2.tests/pom.xml
parent47b7b52b3c1798a536783d652c38fcf4b03dd5d6 (diff)
downloadorg.eclipse.emf.compare-814919e9de93aacc099b18fd76dac201e115b465.tar.gz
org.eclipse.emf.compare-814919e9de93aacc099b18fd76dac201e115b465.tar.xz
org.eclipse.emf.compare-814919e9de93aacc099b18fd76dac201e115b465.zip
[486923,488941] Fix Stack Overflow in ThreeWayComparisonGroupProvider
When conflicts contain diffs which are refined by containment reference changes located in a match above a Stackoverflow exception can occur. This is now avoided. Bug: 486923 Bug: 488941 Change-Id: I1e6e4b465450baf07c8141d1580cf854bcd02783 Signed-off-by: Simon Delisle <simon.delisle@ericsson.com> Signed-off-by: Edgar Mueller <emueller@eclipsesource.com> Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com> Signed-off-by: Alexandra Buzila <abuzila@eclipsesource.com> Signed-off-by: Philip Langer <planger@eclipsesource.com> Also-by: Alexandra Buzila <abuzila@eclipsesource.com> Also-by: Simon Delisle <simon.delisle@ericsson.com>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.uml2.tests/pom.xml')
0 files changed, 0 insertions, 0 deletions

Back to the top