Merge branch 'security-rc' into SECURITY-144-rc

Conflicts:
	core/src/main/java/hudson/FilePath.java
	pom.xml
This commit is contained in:
Jesse Glick committed 2014-10-16 13:18:08 -04:00
commit ccbe96227f
206 files changed
+2418 -421

No files matched your search

+16 -1
View File
@@ -1921,7 +1921,7 @@ public final class FilePath implements Serializable {
private void syncIO() throws InterruptedException {
try {
if (channel!=null)
_syncIO();
channel.syncLocalIO();
} catch (AbstractMethodError e) {
// legacy slave.jar. Handle this gracefully
try {
@@ -1940,6 +1940,21 @@ public final class FilePath implements Serializable {
channel.syncLocalIO();
}
/**
* Remoting interface used for {@link FilePath#copyRecursiveTo(String, FilePath)}.
*
* TODO: this might not be the most efficient way to do the copy.
*/
interface RemoteCopier {
/**
* @param fileName
* relative path name to the output file. Path separator must be '/'.
*/
void open(String fileName) throws IOException;
void write(byte[] buf, int len) throws IOException;
void close() throws IOException;
}
/**
* Copies the contents of this directory recursively into the specified target directory.
*