bodewig 2003/11/28 01:31:13
Modified: . Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs/optional/ssh Tag:
ANT_16_BRANCH ScpToMessage.java
Log:
Merge from HEAD
Revision Changes Path
No revision
No revision
1.503.2.15 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.14
retrieving revision 1.503.2.15
diff -u -r1.503.2.14 -r1.503.2.15
--- WHATSNEW 25 Nov 2003 09:18:04 -0000 1.503.2.14
+++ WHATSNEW 28 Nov 2003 09:31:13 -0000 1.503.2.15
@@ -55,6 +55,9 @@
* <ftp> null pointer exception when attempting rmdir in an empty directory.
Bugzilla Report 24440.
+* <scp> could corrupt files when transfering lots of files.
+ Bugzilla Report 24449.
+
Other changes:
--------------
* Change default uri from ant:core to antlib:org.apache.tools.ant
No revision
No revision
1.4.2.1 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
Index: ScpToMessage.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- ScpToMessage.java 9 Jul 2003 12:12:59 -0000 1.4
+++ ScpToMessage.java 28 Nov 2003 09:31:13 -0000 1.4.2.1
@@ -113,7 +113,6 @@
waitForAck(in);
sendFileToRemote(localFile, in, out);
- waitForAck(in);
} finally {
if (channel != null) {
channel.disconnect();
@@ -134,7 +133,6 @@
Directory current = (Directory) i.next();
sendDirectory(current, in, out);
}
- waitForAck(in);
} finally {
if (channel != null) {
channel.disconnect();
@@ -167,6 +165,7 @@
waitForAck(in);
sendDirectory(directory, in, out);
out.write("E\n".getBytes());
+ waitForAck(in);
}
private void sendFileToRemote(File localFile,
@@ -200,6 +199,7 @@
}
out.flush();
sendAck(out);
+ waitForAck(in);
} finally {
long endTime = System.currentTimeMillis();
logStats(startTime, endTime, totalLength);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
