| commit | 15516eace82431f09127a24e687200b2f1be68ef | |
| author | Alexandra Buzila <abuzila@eclipsesource.com> | |
| Mon, 20 Mar 2017 14:06:17 +0000 (20 15:06 +0100) | ||
| committer | Laurent Goubet <laurent.goubet@obeo.fr> | |
| Fri, 8 Sep 2017 12:11:42 +0000 (8 14:11 +0200) | ||
| tree | 0bd49e820f434de21ea2e4904709b8604b39f68d | treesnapshot (tar.gz zip) |
| parent | 427fdc9c718e03f84968f9b085794ca8f5f68fb4 | commitdiff |
[513931] Fix Deadlock in StructureMergeViewer
Fixes a deadlock in the StructureMergeViewer. The deadlock is avoided by
the workbench, therefore the deadlock only occurs when the
"-allowDeadlock" flag is set or EMFCompare is run outside the workbench
(e.g. pure E4).
Bug: 513931
Signed-off-by: Alexandra Buzila <abuzila@eclipsesource.com>
Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com>
Change-Id: I8bf8d3aa91d10f9341a626a0f978a8b1bb3e7a56
Fixes a deadlock in the StructureMergeViewer. The deadlock is avoided by
the workbench, therefore the deadlock only occurs when the
"-allowDeadlock" flag is set or EMFCompare is run outside the workbench
(e.g. pure E4).
Bug: 513931
Signed-off-by: Alexandra Buzila <abuzila@eclipsesource.com>
Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com>
Change-Id: I8bf8d3aa91d10f9341a626a0f978a8b1bb3e7a56
| plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java | diffblobblamehistory |