From a197fa8c4558f866875f267069a4073d8cac92b1 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Tue, 22 Jan 2008 17:17:13 +0000 Subject: [PATCH] [dstore] null pointer check in property change listener (caught this while debugging) --- .../dstore/RemoteFilePropertyChangeListener.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java index 4fefec11004..adc22d90c8c 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java @@ -164,10 +164,11 @@ public class RemoteFilePropertyChangeListener implements IDomainListener, if (dataStore == parent.getDataStore()) { String dataElementType = parent.getType(); - if (dataElementType + if (dataElementType != null && + (dataElementType .equals(IUniversalDataStoreConstants.UNIVERSAL_FOLDER_DESCRIPTOR) || dataElementType - .equals(IUniversalDataStoreConstants.UNIVERSAL_FILE_DESCRIPTOR) + .equals(IUniversalDataStoreConstants.UNIVERSAL_FILE_DESCRIPTOR)) ) { return true; @@ -209,9 +210,9 @@ public class RemoteFilePropertyChangeListener implements IDomainListener, DataElement subject = (DataElement) children.get(i); String type = subject.getType(); - if (type - .equals(IUniversalDataStoreConstants.UNIVERSAL_FILE_DESCRIPTOR) || - type.equals(IUniversalDataStoreConstants.UNIVERSAL_FOLDER_DESCRIPTOR)) + if (type != null && + (type.equals(IUniversalDataStoreConstants.UNIVERSAL_FILE_DESCRIPTOR) || + type.equals(IUniversalDataStoreConstants.UNIVERSAL_FOLDER_DESCRIPTOR))) { StringBuffer path = new StringBuffer(subject.getAttribute(DE.A_VALUE));