Attachment 205986 Details for Bug 362070 – backport patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] backport patch

patch.txt (text/plain), 1.98 KB, created by David McKnight

on 2011-10-26 10:07:52 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2011-10-26 10:07:52 EDT

Size: 1.98 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services.dstore
>Index: miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalSearchHandler.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalSearchHandler.java,v
>retrieving revision 1.13.2.7
>diff -u -r1.13.2.7 UniversalSearchHandler.java
>--- miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalSearchHandler.java	30 Nov 2010 19:53:06 -0000	1.13.2.7
>+++ miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalSearchHandler.java	26 Oct 2011 14:07:34 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006, 2010 IBM Corporation and others.
>+ * Copyright (c) 2006, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -23,6 +23,7 @@
>  * David McKnight  (IBM)  - [255390] checking for memory
>  * David McKnight  (IBM)  - [261644] [dstore] remote search improvements
>  * David McKnight  (IBM]  - [330989] [dstore] OutOfMemoryError occurs when searching for a text in a large remote file
>+ * Noriaki Takatsu  (IBM) - [362025] [dstore] Search for text hung in encountering a device definition
>  ********************************************************************************/
> 
> package org.eclipse.rse.internal.dstore.universal.miners.filesystem;
>@@ -184,7 +185,9 @@
> 	protected void internalSearch(File theFile, int depth) throws SystemMessageException {
> 		
> 		if (!hasSearched(theFile)) {
>-			
>+			if (!theFile.isDirectory() && !theFile.isFile()) {
>+				return;
>+			}
> 			try {
> 				_alreadySearched.add(theFile.getCanonicalPath());
> 			}

Actions: View | Diff

Attachments on bug 362070: 205986