Attachment #137846 for bug #278341

View | Details | Raw Unified | Return to bug 278341
Collapse All | Expand All

Lines 1-5 Link Here

(-)src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002, 2008 IBM Corporation and others.	2	* Copyright (c) 2002, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 16-21 Link Here
16	* David McKnight (IBM) - [225902] [dstore] use C_NOTIFICATION command to wake up the server	16	* David McKnight (IBM) - [225902] [dstore] use C_NOTIFICATION command to wake up the server
17	* David McKnight (IBM) - [229947] [dstore] interruption to Thread.sleep() should not stop waitForUpdate()	17	* David McKnight (IBM) - [229947] [dstore] interruption to Thread.sleep() should not stop waitForUpdate()
18	* David McKnight (IBM) - [231126] [dstore] status monitor needs to reset WaitThreshold on nudge	18	* David McKnight (IBM) - [231126] [dstore] status monitor needs to reset WaitThreshold on nudge
		19	* David McKnight (IBM) - [278341] [dstore] Disconnect on idle causes the client hang
19	*******************************************************************************/	20	*******************************************************************************/
20		21
21	package org.eclipse.rse.connectorservice.dstore.util;	22	package org.eclipse.rse.connectorservice.dstore.util;
Lines 346-352 Link Here
346	nudges++;	347	nudges++;
347	WaitThreshold = initialWaitThreshold;	348	WaitThreshold = initialWaitThreshold;
348	}	349	}
349	else if (_networkDown)	350	else if (_networkDown \|\| !_dataStore.isConnected())
350	{	351	{
351	dispose();	352	dispose();
352	throw new InterruptedException();	353	throw new InterruptedException();

Lines 1-5 Link Here

(-)src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java (-3 / +7 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002, 2008 IBM Corporation and others.	2	* Copyright (c) 2002, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 14-19 Link Here
14	* Contributors:	14	* Contributors:
15	* David McKnight (IBM) [224906] [dstore] changes for getting properties and doing exit due to single-process capability	15	* David McKnight (IBM) [224906] [dstore] changes for getting properties and doing exit due to single-process capability
16	* David McKnight (IBM) - [244388] [dstore] Connection hangs when a miner not installed	16	* David McKnight (IBM) - [244388] [dstore] Connection hangs when a miner not installed
		17	* David McKnight (IBM) - [278341] [dstore] Disconnect on idle causes the client hang
17	*******************************************************************************/	18	*******************************************************************************/
18		19
19	package org.eclipse.dstore.internal.core.server;	20	package org.eclipse.dstore.internal.core.server;
Lines 66-73 Link Here
66	System.out.println(ServerReturnCodes.RC_FINISHED);	67	System.out.println(ServerReturnCodes.RC_FINISHED);
67		68
68	// only exit if there's no service manager	69	// only exit if there's no service manager
69	if (SystemServiceManager.getInstance().getSystemService() == null)	70	if (SystemServiceManager.getInstance().getSystemService() == null){
70	System.exit(0);	71	System.exit(0);
		72	}
		73	else {
		74	_dataStore.getClient().disconnectServerReceiver();
		75	}
71	}	76	}
72	}	77	}
73		78
Lines 83-89 Link Here
83	// if we do timeout then it's time to shutdown the server	88	// if we do timeout then it's time to shutdown the server
84	return;	89	return;
85	}	90	}
86	System.out.println("server timed out!"); //$NON-NLS-1$
87	_serverTimedOut = true;	91	_serverTimedOut = true;
88	}	92	}
89		93

Return to bug 278341