[tm-cvs-commit] dmcknight org.eclipse.tm.rse/plugins/org.eclipse.dstore.

[Eclipse CVS Genie <genie@xxxxxxxxxxx>]

Update of /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server
In directory dev2:/tmp/cvs-serv32020/src/org/eclipse/dstore/internal/core/server

Modified Files:
      Tag: R3_2_maintenance
	ServerUpdateHandler.java 
Log Message:
[358301] [DSTORE] Hang during debug source look up


Index: ServerUpdateHandler.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerUpdateHandler.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** ServerUpdateHandler.java	20 Apr 2009 18:37:32 -0000	1.5
--- ServerUpdateHandler.java	17 Oct 2011 14:59:41 -0000	1.5.2.1
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2002, 2009 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
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2002, 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
***************
*** 16,19 ****
--- 16,20 ----
   * David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
   * David McKnight  (IBM)   [246826][dstore] KeepAlive does not work correctly
+  * David McKnight    (IBM)  - [358301] [DSTORE] Hang during debug source look up
   *******************************************************************************/
  
***************
*** 262,266 ****
  		if (!_dataObjects.isEmpty() || _pendingKeepAliveConfirmation != null || _pendingKeepAliveRequest != null || !_classesToSend.isEmpty())
  		{
! 			sendUpdates();
  		}
  	}
--- 263,272 ----
  		if (!_dataObjects.isEmpty() || _pendingKeepAliveConfirmation != null || _pendingKeepAliveRequest != null || !_classesToSend.isEmpty())
  		{
! 			try {
! 				sendUpdates();
! 			}
! 			catch (OutOfMemoryError e){
! 				System.exit(-1);
! 			}
  		}
  	}