From cb78b601bb46b31d61d22aab2a32106a48f9ea8e Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Thu, 16 Aug 2007 11:26:34 +0000
Subject: [PATCH] updates
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@6301 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
uk/ac/sanger/artemis/j2ssh/SshPSUClient.java | 32 ++++++++++++++------
1 file changed, 22 insertions(+), 10 deletions(-)
diff --git a/uk/ac/sanger/artemis/j2ssh/SshPSUClient.java b/uk/ac/sanger/artemis/j2ssh/SshPSUClient.java
index c17e5bfe2..5bd510588 100644
--- a/uk/ac/sanger/artemis/j2ssh/SshPSUClient.java
+++ b/uk/ac/sanger/artemis/j2ssh/SshPSUClient.java
@@ -128,9 +128,7 @@ public class SshPSUClient extends Thread
public void run()
{
-
String program = cmd;
-
boolean completed = false;
try
{
@@ -568,21 +566,26 @@ public class SshPSUClient extends Thread
{
// make sure we hang around for stdout
while(stdouth.isAlive() || stderrh.isAlive())
- Thread.sleep(5);
+ Thread.sleep(2);
}
catch(InterruptedException ie)
{
ie.printStackTrace();
}
-
+
// stdout & stderr
- //logger4j.debug("STDOUT \n"+stdouth.getOutput());
- if(!stderrh.getOutput().equals(""))
+ if(stderrh.getBufferSize() > 0)
logger4j.debug("STDERR :"+stderrh.getOutput());
session.close();
return true;
}
+
+
+ public StringBuffer getStdOutBuffer()
+ {
+ return stdouth.getStdOutBuffer();
+ }
public String getStdOut()
{
@@ -652,8 +655,8 @@ public class SshPSUClient extends Thread
private boolean isStdout;
private StringBuffer buff = new StringBuffer();
- protected StdoutStdErrHandler(SessionChannelClient session,
- boolean isStdout)
+ protected StdoutStdErrHandler(final SessionChannelClient session,
+ final boolean isStdout)
{
this.session = session;
this.isStdout = isStdout;
@@ -669,7 +672,7 @@ public class SshPSUClient extends Thread
else
in = session.getStderrInputStream();
- byte buffer[] = new byte[100];
+ final byte buffer[] = new byte[400];
int read;
while((read = in.read(buffer)) > 0)
buff.append(new String(buffer, 0, read));
@@ -681,12 +684,21 @@ public class SshPSUClient extends Thread
ioe.printStackTrace();
}
}
+
+ public synchronized StringBuffer getStdOutBuffer()
+ {
+ return buff;
+ }
public synchronized String getOutput()
{
return buff.toString();
}
-
+
+ public int getBufferSize()
+ {
+ return buff.length();
+ }
}
--
GitLab