From c3698a5f7846e52cad6219b08c95e75fa2e2f934 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Tue, 23 Jan 2007 18:50:50 +0000 Subject: [PATCH] check for deleted items to avoid null pointer --- .../filesystem/UniversalFileSystemMiner.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java index be8b5728905..0572ab998fb 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java @@ -1674,18 +1674,21 @@ private DataElement createDataElementFromLSString(DataElement subject, for (int f = 0; f < children.size(); f++) { DataElement child = (DataElement)children.get(f); - String type = child.getType(); - if (type.equals(UNIVERSAL_FILE_DESCRIPTOR) || type.equals(UNIVERSAL_ARCHIVE_FILE_DESCRIPTOR)) + if (!child.isDeleted()) { - if (StringCompare.compare(filter, child.getName(), false)) + String type = child.getType(); + if (type.equals(UNIVERSAL_FILE_DESCRIPTOR) || type.equals(UNIVERSAL_ARCHIVE_FILE_DESCRIPTOR)) + { + if (StringCompare.compare(filter, child.getName(), false)) + { + filteredChildren.add(child); + } + } + else { filteredChildren.add(child); } } - else - { - filteredChildren.add(child); - } }