Attachment #147401 for bug #289234




 * Noriaki Takatsu  (IBM) - [257666] [multithread] TCP/IP socket connection is not closed
 * David McKnight   (IBM) - [257666] modified original patch to simplify
 * Noriaki Takatsu  (IBM) - [283656] [dstore][multithread] Serviceability issue
 * Noriaki Takatsu  (IBM) - [289234][multithread][api] Reset and Restart KeepAliveRequestThread
 *******************************************************************************/

package org.eclipse.dstore.core.server;

	    	System.out.println(IOe);
	    }
	}
	
	/**
	 * Interrupt the current KeepAliveRequest thread and restart 
	 * the KeepAliveRequest thread with the specified timeout
	 *
	 * @param timeout when the KeepAliveRequest thread is expired
	 */
	public void resetKeepAliveRequest(long timeout) 
	{
		xmlParser().resetKeepAliveRequest(timeout, socket());
	}

}




 * David McKnight  (IBM)   [222163][dstore] Special characters from old server are not restored
 * David McKnight     (IBM)   [224906] [dstore] changes for getting properties and doing exit due to single-process capability
 * David McKnight  (IBM)   [246826][dstore] KeepAlive does not work correctly
 * Noriaki Takatsu (IBM)   [289234][multithread][api] Reset and Restart KeepAliveRequestThread
 *******************************************************************************/

package org.eclipse.dstore.internal.core.util;

		}
	}
	
	/**
	 * Interrupt the current KeepAliveRequest thread and restart 
	 * the KeepAliveRequest thread with the specified timeout
	 *
	 * @param timeout when the KeepAliveRequest thread is expired
	 * @param socket to wait for
	 */
	public void resetKeepAliveRequest(long timeout, Socket socket) {
		if (_kart != null && _kart.isAlive()){
			_kart.interrupt();
		}						
		_kart = new KeepAliveRequestThread(timeout, socket);
		_kart.start();
	}
	
	public class KeepAliveRequestThread extends Thread
	{
		private long _timeout;

Lines 17-22 Link Here

(-)src/org/eclipse/dstore/core/util/Receiver.java (+6 lines)
17	* Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients	17	* Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients
18	* David McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types	18	* David McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
19	* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed	19	* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
		20	* Noriaki Takatsu (IBM) - [289234][multithread][api] Reset and Restart KeepAliveRequestThread
20	*******************************************************************************/	21	*******************************************************************************/
21		22
22	package org.eclipse.dstore.core.util;	23	package org.eclipse.dstore.core.util;
Lines 184-189 Link Here
184	{	185	{
185	return _socket;	186	return _socket;
186	}	187	}
		188
		189	public XMLparser xmlParser()
		190	{
		191	return _xmlParser;
		192	}
187		193
188	/**	194	/**
189	* Implemented to provide a means of handling received input	195	* Implemented to provide a means of handling received input

Return to bug 289234

Lines 18-23 Link Here

(-)src/org/eclipse/dstore/core/server/ServerReceiver.java (+12 lines)
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	* Noriaki Takatsu (IBM) - [283656] [dstore][multithread] Serviceability issue
		21	* Noriaki Takatsu (IBM) - [289234][multithread][api] Reset and Restart KeepAliveRequestThread
21	*******************************************************************************/	22	*******************************************************************************/
22		23
23	package org.eclipse.dstore.core.server;	24	package org.eclipse.dstore.core.server;
Lines 118-122 Link Here
118	System.out.println(IOe);	119	System.out.println(IOe);
119	}	120	}
120	}	121	}
		122
		123	/**
		124	* Interrupt the current KeepAliveRequest thread and restart
		125	* the KeepAliveRequest thread with the specified timeout
		126	*
		127	* @param timeout when the KeepAliveRequest thread is expired
		128	*/
		129	public void resetKeepAliveRequest(long timeout)
		130	{
		131	xmlParser().resetKeepAliveRequest(timeout, socket());
		132	}
121		133
122	}	134	}

Lines 17-22 Link Here

(-)src/org/eclipse/dstore/internal/core/util/XMLparser.java (+16 lines)
17	* David McKnight (IBM) [222163][dstore] Special characters from old server are not restored	17	* David McKnight (IBM) [222163][dstore] Special characters from old server are not restored
18	* David McKnight (IBM) [224906] [dstore] changes for getting properties and doing exit due to single-process capability	18	* David McKnight (IBM) [224906] [dstore] changes for getting properties and doing exit due to single-process capability
19	* David McKnight (IBM) [246826][dstore] KeepAlive does not work correctly	19	* David McKnight (IBM) [246826][dstore] KeepAlive does not work correctly
		20	* Noriaki Takatsu (IBM) [289234][multithread][api] Reset and Restart KeepAliveRequestThread
20	*******************************************************************************/	21	*******************************************************************************/
21		22
22	package org.eclipse.dstore.internal.core.util;	23	package org.eclipse.dstore.internal.core.util;
Lines 1055-1060 Link Here
1055	}	1056	}
1056	}	1057	}
1057		1058
		1059	/**
		1060	* Interrupt the current KeepAliveRequest thread and restart
		1061	* the KeepAliveRequest thread with the specified timeout
		1062	*
		1063	* @param timeout when the KeepAliveRequest thread is expired
		1064	* @param socket to wait for
		1065	*/
		1066	public void resetKeepAliveRequest(long timeout, Socket socket) {
		1067	if (_kart != null && _kart.isAlive()){
		1068	_kart.interrupt();
		1069	}
		1070	_kart = new KeepAliveRequestThread(timeout, socket);
		1071	_kart.start();
		1072	}
		1073
1058	public class KeepAliveRequestThread extends Thread	1074	public class KeepAliveRequestThread extends Thread
1059	{	1075	{
1060	private long _timeout;	1076	private long _timeout;