From 0373d5104ef8edd4d761a713fbf5d751717584d0 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Tue, 3 Mar 2009 16:19:03 +0000 Subject: [PATCH] trivial change - null pointer check --- .../files/core/subsystems/RemoteFile.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java index c34f8f0348b..2c07074f89b 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java @@ -1115,10 +1115,19 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable String path = this.getAbsolutePath(); //String otherHost = other.getHostName(); - String alias1 = this.getParentRemoteFileSubSystem().getHostAliasName(); - String alias2 = other.getParentRemoteFileSubSystem().getHostAliasName(); - - //return getHostName().equals(otherHost) && path.equals(otherPath); + IRemoteFileSubSystem ss1 = this.getParentRemoteFileSubSystem(); + IRemoteFileSubSystem ss2 = other.getParentRemoteFileSubSystem(); + + String alias1 = ""; //$NON-NLS-1$ + if (ss1 != null){ + alias1 = ss1.getHostAliasName(); + } + + String alias2 = ""; + if (ss2 != null){ + alias2 = ss2.getHostAliasName(); + } + return alias1.equals(alias2) && path.equals(otherPath); } else