From dd1475a71834dedaad07ec21f5ff3be0f90a045a Mon Sep 17 00:00:00 2001 From: Kushal Munir < kmunir@ca.ibm.com> Date: Fri, 18 May 2007 02:44:19 +0000 Subject: [PATCH] [181615] Local Search throws NPE. This happens if the search is on a drive such as C:\ on Windows. --- .../services/local/files/LocalFileService.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java index c6be4ece366..e86022dd4cc 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java @@ -754,8 +754,19 @@ public class LocalFileService extends AbstractFileService implements IFileServic { name = name.substring(0, name.length() - ArchiveHandlerManager.VIRTUAL_SEPARATOR.length()); } - boolean isVirtualParent = ArchiveHandlerManager.isVirtual(remoteParent); - boolean isArchiveParent = ArchiveHandlerManager.getInstance().isArchive(new File(remoteParent)); + + boolean isVirtualParent = false; + + if (remoteParent != null) { + isVirtualParent = ArchiveHandlerManager.isVirtual(remoteParent); + } + + boolean isArchiveParent = false; + + if (remoteParent != null) { + isArchiveParent = ArchiveHandlerManager.getInstance().isArchive(new File(remoteParent)); + } + if (!isVirtualParent && !isArchiveParent) { File file = null;