From 067b8a5fba43b8da237dac158a1a44ff45805963 Mon Sep 17 00:00:00 2001 From: Jacobus Martinus Kruithof Date: Fri, 22 Dec 2006 20:48:17 +0000 Subject: [PATCH] PR 41090: jsch-0.1.30 causes SCP task to hang Contributed by Atsuhiko Yamanaka jsch 0.1.30 has improved the stream handling internally and it must be flushed explicitly. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@489755 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 3 +++ .../apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java | 1 + 2 files changed, 4 insertions(+) diff --git a/WHATSNEW b/WHATSNEW index b22fbb04d..fd28942b4 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -8,6 +8,9 @@ Fixed bugs: ----------- * SPI support in jar was broken. Bugzilla report 41201. + +* jsch-0.1.30 causes SCP task to hang + Bugzilla report 41090. Other changes: -------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java index 185902105..f7cb0d3b0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java @@ -209,6 +209,7 @@ public class ScpToMessage extends AbstractSshMessage { waitForAck(in); sendDirectory(directory, in, out); out.write("E\n".getBytes()); + out.flush(); waitForAck(in); }