You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jl...@apache.org on 2012/12/22 00:12:45 UTC
svn commit: r1425181 -
/hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
Author: jlowe
Date: Fri Dec 21 23:12:44 2012
New Revision: 1425181
URL: http://svn.apache.org/viewvc?rev=1425181&view=rev
Log:
svn merge -c 1425177 FIXES: MAPREDUCE-4793. Problem with adding resources when using both -files and -file to hadoop streaming. Contributed by Jason Lowe
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java?rev=1425181&r1=1425180&r2=1425181&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java Fri Dec 21 23:12:44 2012
@@ -306,7 +306,13 @@ public class StreamJob implements Tool {
throw new IllegalArgumentException(e);
}
}
- config_.set("tmpfiles", config_.get("tmpfiles", "") + fileList);
+ String tmpFiles = config_.get("tmpfiles", "");
+ if (tmpFiles.isEmpty()) {
+ tmpFiles = fileList.toString();
+ } else {
+ tmpFiles = tmpFiles + "," + fileList;
+ }
+ config_.set("tmpfiles", tmpFiles);
validate(packageFiles_);
}