From 958b020c6331a353dd6599e93981bb6ababa661a Mon Sep 17 00:00:00 2001 From: David McKnight Date: Wed, 8 Sep 2010 11:27:46 +0000 Subject: [PATCH] [324519] SystemEditableRemoteFile throws NPE when used in headless mode --- .../ui/resources/SystemEditableRemoteFile.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 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 ae75e5188b6..7c950d65a26 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 @@ -39,6 +39,7 @@ * David McKnight (IBM) - [272772] Exception handling in SystemEditableRemoteFile * David McKnight (IBM) - [284420] nullprogressmonitor is needed * David McKnight (IBM) - [310215] SystemEditableRemoteFile.open does not behave as expected + * David McKnight (IBM) - [324519] SystemEditableRemoteFile throws NPE when used in headless mode *******************************************************************************/ package org.eclipse.rse.files.ui.resources; @@ -268,12 +269,15 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP IEditorRegistry registry = getEditorRegistry(); - IEditorDescriptor descriptor = registry.getDefaultEditor(fileName); - if (descriptor == null) - { - descriptor = getDefaultTextEditor(); + if (registry != null){ + IEditorDescriptor descriptor = registry.getDefaultEditor(fileName); + if (descriptor == null) + { + descriptor = getDefaultTextEditor(); + } + + this._editorDescriptor = descriptor; } - this._editorDescriptor = descriptor; } protected IEditorRegistry getEditorRegistry()