From cb86001c56fb6c4a732a379500f42da04aaa8367 Mon Sep 17 00:00:00 2001 From: Daniel Rolka Date: Fri, 19 Apr 2013 13:31:16 +0200 Subject: Bug 405800 - The NPE when the editor with invalid resource gets active Change-Id: I28787552d7118269862eacd738b248f0ebb94979--- .../Eclipse UI/org/eclipse/ui/internal/EditorReference.java | 7 +++++-- .../Eclipse UI/org/eclipse/ui/internal/ViewReference.java | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorReference.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorReference.java index cc9c7760c3e..49756c44518 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorReference.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorReference.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -397,7 +397,10 @@ public class EditorReference extends WorkbenchPartReference implements IEditorRe @Override public PartSite getSite() { - return (PartSite) legacyPart.getSite(); + if (legacyPart != null) { + return (PartSite) legacyPart.getSite(); + } + return null; } private static HashMap> actionCache = new HashMap>(); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewReference.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewReference.java index c799d5a24a2..fc4ed98fc4e 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewReference.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewReference.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -153,6 +153,9 @@ public class ViewReference extends WorkbenchPartReference implements IViewRefere @Override public PartSite getSite() { - return (PartSite) legacyPart.getSite(); + if (legacyPart != null) { + return (PartSite) legacyPart.getSite(); + } + return null; } } -- cgit v1.2.3