Attachment 141807 Details for Bug 283748 – backport fix

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

[patch] backport fix

patch.txt (text/plain), 6.09 KB, created by David McKnight

on 2009-07-16 14:46:44 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2009-07-16 14:46:44 EDT

Size: 6.09 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.dstore.core
>Index: src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java,v
>retrieving revision 1.11.2.1
>diff -u -r1.11.2.1 ServerCommandHandler.java
>--- src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java	1 Jun 2009 18:06:57 -0000	1.11.2.1
>+++ src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java	16 Jul 2009 07:41:00 -0000
>@@ -15,6 +15,7 @@
>  *  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) - [278341] [dstore] Disconnect on idle causes the client hang
>+ *  Noriaki Takatsu  (IBM) - [283656] [dstore][multithread] Serviceability issue
>  *******************************************************************************/
> 
> package org.eclipse.dstore.internal.core.server;
>@@ -65,6 +66,9 @@
> 				_dataStore.getUpdateHandler().finish();
> 				_dataStore.finish();
> 				System.out.println(ServerReturnCodes.RC_FINISHED);
>+				if (_dataStore.getClient() != null) {
>+					_dataStore.getClient().getLogger().logInfo(this.getClass().toString(), "Server timeout");
>+				}
> 				
> 				// only exit if there's no service manager
> 				if (SystemServiceManager.getInstance().getSystemService() == null){
>Index: src/org/eclipse/dstore/core/miners/MinerThread.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/MinerThread.java,v
>retrieving revision 1.4
>diff -u -r1.4 MinerThread.java
>--- src/org/eclipse/dstore/core/miners/MinerThread.java	4 Jun 2008 09:13:57 -0000	1.4
>+++ src/org/eclipse/dstore/core/miners/MinerThread.java	16 Jul 2009 07:40:59 -0000
>@@ -13,6 +13,7 @@
>  *
>  * Contributors:
>  *   Noriaki Takatsu    (IBM)   [220126] [dstore][api][breaking] Single process server for multiple clients
>+ *   Noriaki Takatsu    (IBM)   [283656] [dstore][multithread] Serviceability issue
>  *******************************************************************************/
> 
> package org.eclipse.dstore.core.miners;
>@@ -64,6 +65,9 @@
> 			}
> 			catch (Exception e)
> 			{
>+				if (_dataStore.getClient() != null) {
>+					_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
>+				}
> 				System.out.println(e);
> 			}
> 
>@@ -93,6 +97,9 @@
> 			}
> 			catch (InterruptedException e)
> 			{
>+				if (_dataStore.getClient() != null) {
>+					_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
>+				}
> 				System.out.println(e);
> 			}
> 
>@@ -105,6 +112,9 @@
> 				}
> 				catch (Exception e)
> 				{
>+					if (_dataStore.getClient() != null) {
>+						_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
>+					}
> 					System.out.println(e);
> 				}
> 			}
>Index: src/org/eclipse/dstore/core/server/ServerReceiver.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java,v
>retrieving revision 1.9.2.2
>diff -u -r1.9.2.2 ServerReceiver.java
>--- src/org/eclipse/dstore/core/server/ServerReceiver.java	4 Feb 2009 23:02:43 -0000	1.9.2.2
>+++ src/org/eclipse/dstore/core/server/ServerReceiver.java	16 Jul 2009 07:40:59 -0000
>@@ -17,6 +17,7 @@
>  * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
>  * 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
>  *******************************************************************************/
> 
> package org.eclipse.dstore.core.server;
>@@ -90,6 +91,9 @@
> 	    	socket().close();
> 	    }
> 	    catch (IOException e){
>+	    	if (_dataStore.getClient() != null) {
>+				_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
>+			}
> 	    	System.out.println(e);
> 	    }
> 	}
>@@ -99,6 +103,9 @@
> 	 */
> 	public void handleError(Throwable e)
> 	{
>+		if (_dataStore.getClient() != null) {
>+			_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
>+		}
> 		System.out.println("RECEIVER ERROR"); //$NON-NLS-1$
> 		e.printStackTrace();
> 		System.out.println(e);
>Index: src/org/eclipse/dstore/core/server/ConnectionEstablisher.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java,v
>retrieving revision 1.11
>diff -u -r1.11 ConnectionEstablisher.java
>--- src/org/eclipse/dstore/core/server/ConnectionEstablisher.java	12 Aug 2008 18:13:24 -0000	1.11
>+++ src/org/eclipse/dstore/core/server/ConnectionEstablisher.java	16 Jul 2009 07:40:59 -0000
>@@ -22,6 +22,7 @@
>  * Noriaki Takatsu  (IBM) - [226237] [dstore] Move the place where the ServerLogger instance is made
>  * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
>  * Noriaki Takatsu  (IBM) - [242968] [multithread] serverSocket must be closed when an exception happens in Accept
>+ * Noriaki Takatsu  (IBM) - [283656] [dstore][multithread] Serviceability issue
>  *******************************************************************************/
> 
> package org.eclipse.dstore.core.server;
>@@ -507,6 +508,9 @@
> 	   	}
> 	   	catch (IOException e)
> 	   	{
>+	   		if (_dataStore.getClient() != null) {
>+				_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
>+			}
> 	   		System.out.println(e);
> 	   	}
>

Flags:

mober.at+eclipse: iplog-

Actions: View | Diff

Attachments on bug 283748: 141807