From 7a2d309eb80a98392ff86837f48e7dcbd6fe7d92 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Mon, 28 Apr 2008 19:46:47 +0000 Subject: [PATCH] [229116] NPE in when editing remote file in new workspace --- .../org/eclipse/rse/internal/core/model/SystemRegistry.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java index eec8a842960..e9e91054dac 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java @@ -50,6 +50,7 @@ * David Dykstal (IBM) - [168976][api] move ISystemNewConnectionWizardPage from core to UI * Martin Oberhuber (Wind River) - [228774] Improve ElementComparer Performance * David McKnight (IBM) - [225747] [dstore] Trying to connect to an "Offline" system throws an NPE + * David McKnight (IBM) - [229116] NPE in when editing remote file in new workspace ********************************************************************************/ package org.eclipse.rse.internal.core.model; @@ -940,6 +941,10 @@ public class SystemRegistry implements ISystemRegistry if (firstObject == secondObject) { return true; } + // should never be comparing null objects + if (firstObject == null || secondObject == null){ + return false; + } ISystemDragDropAdapter adA = null; ISystemDragDropAdapter adB = null; if (firstObjectFullName == null) {