From 12ee882ba1b245980e6b705b1e092f4865e74894 Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Wed, 13 Aug 2008 15:33:45 +0000
Subject: [PATCH] [243699] [dstore] Loop in OutputHandler

---
 .../universal/miners/command/OutputHandler.java       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java
index acf387f4aac..c289a0c86b5 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java
+++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David McKnight   (IBM)        - [207178] changing list APIs for file service and subsystems
+ * David McKnight   (IBM)        - [243699] [dstore] Loop in OutputHandler
  *******************************************************************************/
 
 package org.eclipse.rse.internal.dstore.universal.miners.command;
@@ -205,13 +206,19 @@ public class OutputHandler extends Handler {
 
 					// if output is not null, we assume the encoding was correct
 					// and process the output
-					if (fullOutput != null /* && fullOutput.length() == numRead */) {
+					if (fullOutput != null) {
 						// tokenize the output so that we can get each line of
 						// output
 						// the delimiters are therefore set to "\n\r"
 						StringTokenizer tokenizer = new StringTokenizer(
 								fullOutput, "\n\r"); //$NON-NLS-1$
 						int numTokens = tokenizer.countTokens();
+						if (numTokens == 0){
+							output = new String[1];
+							output[0] = fullOutput;
+							return output;
+						}
+						
 						output = new String[numTokens];
 						int index = 0;
 						while (tokenizer.hasMoreTokens()) {
@@ -220,6 +227,8 @@ public class OutputHandler extends Handler {
 						}
 
 						String lastLine = output[index - 1];
+	
+						
 						if (!_endOfStream && (!fullOutput.endsWith("\n") && !fullOutput.endsWith("\r"))) //$NON-NLS-1$ //$NON-NLS-2$
 						{
 							// our last line may be cut off