From 1c843c0bea9ef0a1ebdeab5d74ff8a4833d14a54 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Fri, 20 Jul 2012 17:25:24 +0000 Subject: [PATCH] [385416] NPE during shutdown with remote editor open --- .../ui/resources/SystemEditableRemoteFile.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java index 9f9e7989d38..d5e580898bc 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java @@ -47,6 +47,7 @@ * Rick Sawyer (IBM) - [376535] RSE does not respect editor overrides * David McKnight (IBM) - [357111] [DSTORE]File with invalid characters can't be opened in editor * David McKnight (IBM) - [385420] double-click to open System editor from Remote Systems view not working + * David McKnight (IBM) - [385416] NPE during shutdown with remote editor open *******************************************************************************/ package org.eclipse.rse.files.ui.resources; @@ -1866,12 +1867,14 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP //delete(); SystemUniversalTempFileListener.getListener().unregisterEditedFile(this); - - IWorkbenchPage page = SystemBasePlugin.getActiveWorkbenchWindow().getActivePage(); - if (page != null){ - page.removePartListener(this); - editor = null; - } + IWorkbenchWindow win = SystemBasePlugin.getActiveWorkbenchWindow(); + if (win != null){ // if the window is already closed, the listener doesn't matter + IWorkbenchPage page = win.getActivePage(); + if (page != null){ + page.removePartListener(this); + editor = null; + } + } } }