[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[tm-cvs-commit] dmcknight org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem UniversalSearchHandler.java

Update of /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem
In directory dev1:/tmp/cvs-serv20249/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem

Modified Files:
      Tag: R3_2_maintenance
	UniversalSearchHandler.java 
Log Message:
[380562] [multithread][dstore] File Search is not canceled by the client UI on disconnect


Index: 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.22.2.3
retrieving revision 1.22.2.4
diff -C2 -d -r1.22.2.3 -r1.22.2.4
*** UniversalSearchHandler.java	13 Feb 2012 21:05:07 -0000	1.22.2.3
--- UniversalSearchHandler.java	24 May 2012 20:11:18 -0000	1.22.2.4
***************
*** 28,31 ****
--- 28,32 ----
   * Noriaki Takatsu  (IBM) - [362025] [dstore] Search for text hung in encountering a device definition
   * David McKnight   (IBM) - [371401] [dstore][multithread] avoid use of static variables - causes memory leak after disconnect
+  * Noriaki Takatsu  (IBM) - [380562] [multithread][dstore] File Search is not canceled by the client UI on disconnect
   ********************************************************************************/
  
***************
*** 403,407 ****
  					int offset = 0;
  					
! 					while (offset < fileLength && !matched){
  						long readSize = MAX_READ;
  						if (offset +  MAX_READ > fileLength){
--- 404,408 ----
  					int offset = 0;
  					
! 					while (offset < fileLength && !matched && !_isCancelled){
  						long readSize = MAX_READ;
  						if (offset +  MAX_READ > fileLength){