MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

merge: execute finally block on registerUndoRedo failure

Browse Source 
EA-92269 - assert: MergeModelBase.dispose
This commit is contained in:
Aleksey Pivovarov
2016-11-24 12:09:37 +03:00
parent 11aafd228d
commit d95f1d515d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/merge/MergeModelBase.java
+7 -3
View File
@@ -234,12 +234,16 @@ public abstract class MergeModelBase<S extends MergeModelBase.State> implements
myInsideCommand = true;
enterBulkChangeUpdateBlock();
registerUndoRedo(true, allAffectedChanges);
try {
task.run();
registerUndoRedo(true, allAffectedChanges);
try {
task.run();
}
finally {
registerUndoRedo(false, allAffectedChanges);
}
}
finally {
registerUndoRedo(false, allAffectedChanges);
exitBulkChangeUpdateBlock();
myInsideCommand = false;
}