diff options
| author | Michael Valenta | 2007-09-05 14:50:22 +0000 |
|---|---|---|
| committer | Michael Valenta | 2007-09-05 14:50:22 +0000 |
| commit | c3db16c8cf1c2ed85f92936acfb1497bb328d719 (patch) | |
| tree | e049c414b9d8c017cbdedc113bf770a5090f073c /bundles/org.eclipse.compare/compare/org | |
| parent | 34f1ed91820148a48d0e212b469778883e798d3e (diff) | |
| download | eclipse.platform.team-c3db16c8cf1c2ed85f92936acfb1497bb328d719.tar.gz eclipse.platform.team-c3db16c8cf1c2ed85f92936acfb1497bb328d719.tar.xz eclipse.platform.team-c3db16c8cf1c2ed85f92936acfb1497bb328d719.zip | |
Bug 201547 NPE after closing duplicated compare editor
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org')
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java | 13 |
1 files changed, 8 insertions, 5 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 4934b2563..bd9c368aa 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java @@ -1068,12 +1068,15 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang * @see org.eclipse.compare.ICompareContainer#getActionBars() */ public IActionBars getActionBars() { - IActionBars actionBars = fContainer.getActionBars(); - if (actionBars == null && !fContainerProvided) { - // The old way to find the action bars - return Utilities.findActionBars(fComposite); + if (fContainer != null) { + IActionBars actionBars = fContainer.getActionBars(); + if (actionBars == null && !fContainerProvided) { + // The old way to find the action bars + return Utilities.findActionBars(fComposite); + } + return actionBars; } - return actionBars; + return null; } /* (non-Javadoc) |