mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-27 10:55:33 +02:00
Code Issues Wiki Activity

[409616] [dstore] ServerCommandHandler update for restarted

Browse source 
ServerIdleThread
This commit is contained in:
David McKnight 2013-05-31 13:34:41 -04:00
parent 9c508fce06
commit 58100b0455
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java
View file

@ -22,6 +22,7 @@
* David McKnight (IBM) - [373459] [dstore][multithread] duplicate finish() calls during idle timeout * David McKnight (IBM) - [373459] [dstore][multithread] duplicate finish() calls during idle timeout
* David McKnight (IBM) - [378136] [dstore] miner.finish is stuck * David McKnight (IBM) - [378136] [dstore] miner.finish is stuck
* David McKnight (IBM) - [408801] [dstore] change ServerIdleThread so that it can extend SecuredThread * David McKnight (IBM) - [408801] [dstore] change ServerIdleThread so that it can extend SecuredThread
* David McKnight (IBM) - [409616] [dstore] ServerCommandHandler update for restarted ServerIdleThread
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dstore.internal.core.server; package org.eclipse.dstore.internal.core.server;
@ -222,7 +223,7 @@ public class ServerCommandHandler extends CommandHandler
if (_dataStore.getClient() != null) { if (_dataStore.getClient() != null) {
_dataStore.getClient().getLogger().logInfo(this.getClass().toString(), "ServerCommandHandler.finish()"); //$NON-NLS-1$ _dataStore.getClient().getLogger().logInfo(this.getClass().toString(), "ServerCommandHandler.finish()"); //$NON-NLS-1$
} }
_dataStore.setConnected(false); // set dstore to be not connected so the server idle thread doesn't get started again
if (_serverIdleThread != null){ if (_serverIdleThread != null){
if (_dataStore.getClient() != null) { if (_dataStore.getClient() != null) {
_dataStore.getClient().getLogger().logInfo(this.getClass().toString(), "ServerCommandHandler clearing server idle thread"); //$NON-NLS-1$ _dataStore.getClient().getLogger().logInfo(this.getClass().toString(), "ServerCommandHandler clearing server idle thread"); //$NON-NLS-1$
@ -305,6 +306,7 @@ public class ServerCommandHandler extends CommandHandler
if (commandName.equals(DataStoreSchema.C_VALIDATE_TICKET)) if (commandName.equals(DataStoreSchema.C_VALIDATE_TICKET))
{ {
_dataStore.setConnected(true); // make sure set to connected so server idle thread can be started
DataElement serverTicket = _dataStore.getTicket(); DataElement serverTicket = _dataStore.getTicket();
DataElement clientTicket = command.get(0); DataElement clientTicket = command.get(0);
String st = serverTicket.getName(); String st = serverTicket.getName();
@ -623,7 +625,7 @@ public class ServerCommandHandler extends CommandHandler
// new command so restart timeout // new command so restart timeout
_serverIdleThread.interrupt(); _serverIdleThread.interrupt();
} }
else else if (_dataStore.isConnected()) // only create idle thread when connected
{ {
_serverIdleThread = new ServerIdleThread(serverIdleShutdownTimeout, _dataStore); _serverIdleThread = new ServerIdleThread(serverIdleShutdownTimeout, _dataStore);
_serverIdleThread.start(); _serverIdleThread.start();