Attachment 155924 Details for Bug 299433 – 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), 4.23 KB, created by David McKnight

on 2010-01-12 16:10:07 EST

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2010-01-12 16:10:07 EST

Size: 4.23 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services.dstore
>Index: miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java,v
>retrieving revision 1.21.2.6
>diff -u -r1.21.2.6 CommandMinerThread.java
>--- miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java	19 Oct 2009 17:23:36 -0000	1.21.2.6
>+++ miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java	12 Jan 2010 21:13:50 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2003, 2009 IBM Corporation and others.
>+ * Copyright (c) 2003, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -24,6 +24,7 @@
>  *  David McKnight (IBM) - [286671] Dstore shell service interprets &lt; and &gt; sequences
>  *  David McKnight     (IBM)   [290743] [dstore][shells] allow bash shells and custom shell invocation
>  *  David McKnight     (IBM)   [287305] [dstore] Need to set proper uid for commands when using SecuredThread and single server for multiple clients[
>+ *  Peter Wang         (IBM)   [299422] [dstore] OutputHandler.readLines() not compatible with servers that return max 1024bytes available to be read
>  *******************************************************************************/
> 
> package org.eclipse.rse.internal.dstore.universal.miners.command;
>@@ -672,7 +673,12 @@
> 
> 				writer.write(input);
> 				writer.newLine();
>-				writer.flush();
>+				try{
>+					writer.flush();
>+				}
>+				catch (Exception e){
>+					//TODO find actual cause of problem. This only fails on certain machines. 
>+				}
> 
> 				if (!_isWindows && (input.startsWith("cd ") || input.equals("cd"))) //$NON-NLS-1$ //$NON-NLS-2$
> 				{
>Index: miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java,v
>retrieving revision 1.8.2.6
>diff -u -r1.8.2.6 OutputHandler.java
>--- miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java	16 Nov 2009 14:24:44 -0000	1.8.2.6
>+++ miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java	12 Jan 2010 21:13:50 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006, 2009 IBM Corporation and others.
>+ * Copyright (c) 2006, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -16,6 +16,7 @@
>  * David McKnight   (IBM)        - [243699] [dstore] Loop in OutputHandler
>  * David McKnight     (IBM)   [249715] [dstore][shells] Unix shell does not echo command
>  * David McKnight   (IBM)     [282919] [dstore] server shutdown results in exception in shell io reading
>+ * Peter Wang         (IBM)   [299422] [dstore] OutputHandler.readLines() not compatible with servers that return max 1024bytes available to be read
>  *******************************************************************************/
> 
> package org.eclipse.rse.internal.dstore.universal.miners.command;
>@@ -139,7 +140,7 @@
> 
> 			// if there's none, wait a bit and return true to continue
> 			if (available <= 0) {
>-				sleep(100);
>+				sleep(1500);
> 				available = _reader.available();
> 			}
> 			return available;
>@@ -245,7 +246,7 @@
> 							
> 							int lastIndex = 0;
> 									
>-							available = _reader.available();
>+							available = checkAvailable();
> 							if (available > 0)
> 							{
> 								while (!_endOfStream && lastIndex < MAX_OFFSET)

Actions: View | Diff

Attachments on bug 299433: 155924