Attachment #141807 for bug #283748

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

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

Lines 13-18 Link Here

(-)src/org/eclipse/dstore/core/miners/MinerThread.java (+10 lines)
13	*	13	*
14	* Contributors:	14	* Contributors:
15	* Noriaki Takatsu (IBM) [220126] [dstore][api][breaking] Single process server for multiple clients	15	* Noriaki Takatsu (IBM) [220126] [dstore][api][breaking] Single process server for multiple clients
		16	* Noriaki Takatsu (IBM) [283656] [dstore][multithread] Serviceability issue
16	*******************************************************************************/	17	*******************************************************************************/
17		18
18	package org.eclipse.dstore.core.miners;	19	package org.eclipse.dstore.core.miners;
Lines 64-69 Link Here
64	}	65	}
65	catch (Exception e)	66	catch (Exception e)
66	{	67	{
		68	if (_dataStore.getClient() != null) {
		69	_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
		70	}
67	System.out.println(e);	71	System.out.println(e);
68	}	72	}
69		73
Lines 93-98 Link Here
93	}	97	}
94	catch (InterruptedException e)	98	catch (InterruptedException e)
95	{	99	{
		100	if (_dataStore.getClient() != null) {
		101	_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
		102	}
96	System.out.println(e);	103	System.out.println(e);
97	}	104	}
98		105
Lines 105-110 Link Here
105	}	112	}
106	catch (Exception e)	113	catch (Exception e)
107	{	114	{
		115	if (_dataStore.getClient() != null) {
		116	_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
		117	}
108	System.out.println(e);	118	System.out.println(e);
109	}	119	}
110	}	120	}

Lines 17-22 Link Here

(-)src/org/eclipse/dstore/core/server/ServerReceiver.java (+7 lines)
17	* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed	17	* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
18	* Noriaki Takatsu (IBM) - [257666] [multithread] TCP/IP socket connection is not closed	18	* Noriaki Takatsu (IBM) - [257666] [multithread] TCP/IP socket connection is not closed
19	* David McKnight (IBM) - [257666] modified original patch to simplify	19	* David McKnight (IBM) - [257666] modified original patch to simplify
		20	* Noriaki Takatsu (IBM) - [283656] [dstore][multithread] Serviceability issue
20	*******************************************************************************/	21	*******************************************************************************/
21		22
22	package org.eclipse.dstore.core.server;	23	package org.eclipse.dstore.core.server;
Lines 90-95 Link Here
90	socket().close();	91	socket().close();
91	}	92	}
92	catch (IOException e){	93	catch (IOException e){
		94	if (_dataStore.getClient() != null) {
		95	_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
		96	}
93	System.out.println(e);	97	System.out.println(e);
94	}	98	}
95	}	99	}
Lines 99-104 Link Here
99	*/	103	*/
100	public void handleError(Throwable e)	104	public void handleError(Throwable e)
101	{	105	{
		106	if (_dataStore.getClient() != null) {
		107	_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
		108	}
102	System.out.println("RECEIVER ERROR"); //$NON-NLS-1$	109	System.out.println("RECEIVER ERROR"); //$NON-NLS-1$
103	e.printStackTrace();	110	e.printStackTrace();
104	System.out.println(e);	111	System.out.println(e);

Lines 22-27 Link Here

(-)src/org/eclipse/dstore/core/server/ConnectionEstablisher.java (+4 lines)
22	* Noriaki Takatsu (IBM) - [226237] [dstore] Move the place where the ServerLogger instance is made	22	* Noriaki Takatsu (IBM) - [226237] [dstore] Move the place where the ServerLogger instance is made
23	* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed	23	* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
24	* Noriaki Takatsu (IBM) - [242968] [multithread] serverSocket must be closed when an exception happens in Accept	24	* Noriaki Takatsu (IBM) - [242968] [multithread] serverSocket must be closed when an exception happens in Accept
		25	* Noriaki Takatsu (IBM) - [283656] [dstore][multithread] Serviceability issue
25	*******************************************************************************/	26	*******************************************************************************/
26		27
27	package org.eclipse.dstore.core.server;	28	package org.eclipse.dstore.core.server;
Lines 507-512 Link Here
507	}	508	}
508	catch (IOException e)	509	catch (IOException e)
509	{	510	{
		511	if (_dataStore.getClient() != null) {
		512	_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
		513	}
510	System.out.println(e);	514	System.out.println(e);
511	}	515	}
512		516

Return to bug 283748

Lines 15-20 Link Here

(-)src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java (+4 lines)
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	* David McKnight (IBM) - [278341] [dstore] Disconnect on idle causes the client hang
		18	* Noriaki Takatsu (IBM) - [283656] [dstore][multithread] Serviceability issue
18	*******************************************************************************/	19	*******************************************************************************/
19		20
20	package org.eclipse.dstore.internal.core.server;	21	package org.eclipse.dstore.internal.core.server;
Lines 65-70 Link Here
65	_dataStore.getUpdateHandler().finish();	66	_dataStore.getUpdateHandler().finish();
66	_dataStore.finish();	67	_dataStore.finish();
67	System.out.println(ServerReturnCodes.RC_FINISHED);	68	System.out.println(ServerReturnCodes.RC_FINISHED);
		69	if (_dataStore.getClient() != null) {
		70	_dataStore.getClient().getLogger().logInfo(this.getClass().toString(), "Server timeout");
		71	}
68		72
69	// only exit if there's no service manager	73	// only exit if there's no service manager
70	if (SystemServiceManager.getInstance().getSystemService() == null){	74	if (SystemServiceManager.getInstance().getSystemService() == null){