mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-12 18:55:38 +02:00
Code Issues Wiki Activity

[278341] [dstore] Disconnect on idle causes the client hang

Browse source
This commit is contained in:
David McKnight 2009-06-01 18:03:57 +00:00
parent 869a1b61cb
commit c36a573770
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2002, 2008 IBM Corporation and others. * Copyright (c) 2002, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -14,6 +14,7 @@
* Contributors: * Contributors:
* David McKnight (IBM) [224906] [dstore] changes for getting properties and doing exit due to single-process capability * David McKnight (IBM) [224906] [dstore] changes for getting properties and doing exit due to single-process capability
* David McKnight (IBM) - [244388] [dstore] Connection hangs when a miner not installed * David McKnight (IBM) - [244388] [dstore] Connection hangs when a miner not installed
* David McKnight (IBM) - [278341] [dstore] Disconnect on idle causes the client hang
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dstore.internal.core.server; package org.eclipse.dstore.internal.core.server;
@ -59,15 +60,19 @@ public class ServerCommandHandler extends CommandHandler
} }
if (_serverTimedOut) if (_serverTimedOut)
{ {
System.out.println("server timed out");
_dataStore.getCommandHandler().finish(); _dataStore.getCommandHandler().finish();
_dataStore.getUpdateHandler().finish(); _dataStore.getUpdateHandler().finish();
_dataStore.finish(); _dataStore.finish();
System.out.println(ServerReturnCodes.RC_FINISHED); System.out.println(ServerReturnCodes.RC_FINISHED);
// only exit if there's no service manager // only exit if there's no service manager
if (SystemServiceManager.getInstance().getSystemService() == null) if (SystemServiceManager.getInstance().getSystemService() == null){
System.exit(0); System.exit(0);
}
else {
_dataStore.getClient().disconnectServerReceiver();
}
} }
} }
@ -83,7 +88,6 @@ public class ServerCommandHandler extends CommandHandler
// if we do timeout then it's time to shutdown the server // if we do timeout then it's time to shutdown the server
return; return;
} }
System.out.println("server timed out!"); //$NON-NLS-1$
_serverTimedOut = true; _serverTimedOut = true;
} }

5
rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2002, 2008 IBM Corporation and others. * Copyright (c) 2002, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -16,6 +16,7 @@
* David McKnight (IBM) - [225902] [dstore] use C_NOTIFICATION command to wake up the server * David McKnight (IBM) - [225902] [dstore] use C_NOTIFICATION command to wake up the server
* David McKnight (IBM) - [229947] [dstore] interruption to Thread.sleep() should not stop waitForUpdate() * David McKnight (IBM) - [229947] [dstore] interruption to Thread.sleep() should not stop waitForUpdate()
* David McKnight (IBM) - [231126] [dstore] status monitor needs to reset WaitThreshold on nudge * David McKnight (IBM) - [231126] [dstore] status monitor needs to reset WaitThreshold on nudge
* David McKnight (IBM) - [278341] [dstore] Disconnect on idle causes the client hang
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.connectorservice.dstore.util; package org.eclipse.rse.connectorservice.dstore.util;
@ -346,7 +347,7 @@ public class StatusMonitor implements IDomainListener, ICommunicationsListener
nudges++; nudges++;
WaitThreshold = initialWaitThreshold; WaitThreshold = initialWaitThreshold;
} }
else if (_networkDown) else if (_networkDown || !_dataStore.isConnected())
{ {
dispose(); dispose();
throw new InterruptedException(); throw new InterruptedException();