Skip to content

Fix NPE in DocumentMerger.doDiff #123 #2990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ravnskjaer wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −0
Open

Fix NPE in DocumentMerger.doDiff #123 #2990

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,13 @@ protected IStatus run(final IProgressMonitor monitor) {
if (hadPreviousInput || (knownSaveables != null && !isAllSaveablesKnown())) {
registerSaveable();
}
// Check if the contents are being created right now, e.g. by the "still
// initializing" timer, with this syncExec dispatched by the event loop of
// the first diff. Creating them again would leave a second, orphaned
// content tree, whose viewer later diffs against a disposed input.
if (CompareEditor.this.getState() == CREATING_CONTROL) {
return;
}
setState(newState[0]);
createCompareControl();
});
Expand Down