diff options
| author | Michael Valenta | 2007-06-25 13:56:40 +0000 |
|---|---|---|
| committer | Michael Valenta | 2007-06-25 13:56:40 +0000 |
| commit | 36142553cf042a0df6209051b150be7674e77b27 (patch) | |
| tree | f09a6e510a8f37c5d7ee03b5768471a9a6138f2b /bundles | |
| parent | 8009cd976a121fa980d226b2231fe319923065f0 (diff) | |
| download | eclipse.platform.team-36142553cf042a0df6209051b150be7674e77b27.tar.gz eclipse.platform.team-36142553cf042a0df6209051b150be7674e77b27.tar.xz eclipse.platform.team-36142553cf042a0df6209051b150be7674e77b27.zip | |
Bug 190822 [Edit] SaveableCompareEditorInput.prepareInput throws NPE when prepareCompareInput returns null
Diffstat (limited to 'bundles')
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java index a1c8c8210..8e23a2cb3 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java @@ -235,7 +235,8 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl protected Object prepareInput(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { final ICompareInput input = prepareCompareInput(monitor); - setTitle(NLS.bind(TeamUIMessages.SyncInfoCompareInput_title, new String[] { input.getName() })); + if (input != null) + setTitle(NLS.bind(TeamUIMessages.SyncInfoCompareInput_title, new String[] { input.getName()})); return input; } |