diff options
author | Andre Weinand | 2004-12-21 19:28:11 +0000 |
---|---|---|
committer | Andre Weinand | 2004-12-21 19:28:11 +0000 |
commit | 9f435eb31b76836235c9e23ee617a39b2fdcb8ca (patch) | |
tree | 8845d1d8a08a92c0d69c64a6abb99339d902b0c7 | |
parent | b6a1d70c805eefd529639da707e0d1e7743ccc41 (diff) | |
download | eclipse.platform.team-9f435eb31b76836235c9e23ee617a39b2fdcb8ca.tar.gz eclipse.platform.team-9f435eb31b76836235c9e23ee617a39b2fdcb8ca.tar.xz eclipse.platform.team-9f435eb31b76836235c9e23ee617a39b2fdcb8ca.zip |
fixed #80387: NPE opening compare editor
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java index 9cfb91b88..c450b5905 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java @@ -193,7 +193,7 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang CompareUIPlugin.log(e); } IFile[] files= (IFile[]) getAdapter(IFile[].class); - if (files.length > 0) + if (files != null && files.length > 0) return files[0]; // can only return one: limitation on IDE.saveAllEditors; see #64617 return null; } diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java index 9cfb91b88..c450b5905 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java @@ -193,7 +193,7 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang CompareUIPlugin.log(e); } IFile[] files= (IFile[]) getAdapter(IFile[].class); - if (files.length > 0) + if (files != null && files.length > 0) return files[0]; // can only return one: limitation on IDE.saveAllEditors; see #64617 return null; } |