[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.dstore.core/src/org/eclipse/dstore/core/server ServerReceiver.java

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

Modified Files:
      Tag: R3_2_maintenance
	ServerReceiver.java 
Log Message:
missed setting of _log when backporting

Index: ServerReceiver.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -C2 -d -r1.12.2.1 -r1.12.2.2
*** ServerReceiver.java	25 Jul 2012 13:52:36 -0000	1.12.2.1
--- ServerReceiver.java	2 Aug 2012 18:40:55 -0000	1.12.2.2
***************
*** 56,59 ****
--- 56,60 ----
  		super(socket, connection.getDataStore());
  		_connection = connection;
+ 		_log = _dataStore.getLogRoot();		
  	}
  
***************
*** 73,93 ****
  
  			// max log 
! 			List logged = _log.getNestedData();
! 			if (logged == null){
! 				_log.addNestedData(rootOutput, false);
! 				_logIndex++;
! 			}
! 			else {
! 				if (_logIndex > _maxLog){
! 					_logIndex = 0; // reset logindex
! 				}
! 			
! 				if (logged.size() > _logIndex){
! 					logged.set(_logIndex, rootOutput);
  				}
  				else {
! 					logged.add(_logIndex, rootOutput);
  				}
- 				_logIndex++;
  			}
  			
--- 74,96 ----
  
  			// max log 
! 			if (_log != null){
! 				List logged = _log.getNestedData();
! 				if (logged == null){
! 					_log.addNestedData(rootOutput, false);
! 					_logIndex++;
  				}
  				else {
! 					if (_logIndex > _maxLog){
! 						_logIndex = 0; // reset logindex
! 					}
! 				
! 					if (logged.size() > _logIndex){
! 						logged.set(_logIndex, rootOutput);
! 					}
! 					else {
! 						logged.add(_logIndex, rootOutput);
! 					}
! 					_logIndex++;
  				}
  			}