From 8731a9cb2f3f83c2521efd55ec5549095e0000b7 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 27 Oct 2011 13:49:25 +0000 Subject: [PATCH] [362025] [dstore] Search for text hung in encountering a device definition --- .../universal/miners/filesystem/UniversalSearchHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalSearchHandler.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalSearchHandler.java index 27be59ee89f..017bac6723b 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalSearchHandler.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalSearchHandler.java @@ -27,6 +27,7 @@ * David McKnight (IBM] - [330989] [dstore] OutOfMemoryError occurs when searching for a text in a large remote file * David McKnight (IBM) - [283613] [dstore] Create a Constants File for all System Properties we support * David McKnight (IBM) - [358301] [DSTORE] Hang during debug source look up + * Noriaki Takatsu (IBM) - [362025] [dstore] Search for text hung in encountering a device definition ********************************************************************************/ package org.eclipse.rse.internal.dstore.universal.miners.filesystem; @@ -210,7 +211,9 @@ public class UniversalSearchHandler extends SecuredThread implements ICancellabl protected void internalSearch(File theFile, int depth) throws SystemMessageException { if (!hasSearched(theFile)) { - + if (!theFile.isDirectory() && !theFile.isFile()) { + return; + } if (!_searchOnlyUniqueFolders){ _alreadySearched.add(theFile.getAbsolutePath()); }