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 cu...@apache.org on 2007/03/30 19:16:07 UTC
svn commit: r524184 - in /lucene/hadoop/trunk: CHANGES.txt
src/java/org/apache/hadoop/util/CopyFiles.java
Author: cutting
Date: Fri Mar 30 10:16:06 2007
New Revision: 524184
URL: http://svn.apache.org/viewvc?view=rev&rev=524184
Log:
HADOOP-1169. Fix a cut/paste error in the CopyFiles utility so that S3-based source files are correctly copied. Contributed by Michael Stack.
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/src/java/org/apache/hadoop/util/CopyFiles.java
Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=524184&r1=524183&r2=524184
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Fri Mar 30 10:16:06 2007
@@ -61,6 +61,9 @@
18. HADOOP-1166. Add a NullOutputFormat and use it in the
RandomWriter example. (omalley via cutting)
+19. HADOOP-1169. Fix a cut/paste error in CopyFiles utility so that
+ S3-based source files are correctly copied. (Michael Stack via cutting)
+
Release 0.12.3 (not yet released)
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/util/CopyFiles.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/util/CopyFiles.java?view=diff&rev=524184&r1=524183&r2=524184
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/util/CopyFiles.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/util/CopyFiles.java Fri Mar 30 10:16:06 2007
@@ -739,16 +739,14 @@
srcPaths = httpUrls;
mapper = CopyMapperFactory.getMapper(conf, "http");
} else {
- return;
- }
-
- // Protocol - 's3://'
- String[] s3Urls = parseInputFile(S3, srcPaths);
- if(httpUrls != null) {
+ // Protocol - 's3://'
+ String[] s3Urls = parseInputFile(S3, srcPaths);
+ if(s3Urls != null) {
srcPaths = s3Urls;
- mapper = CopyMapperFactory.getMapper(conf, S3);
- } else {
- return;
+ mapper = CopyMapperFactory.getMapper(conf, S3);
+ } else {
+ return;
+ }
}
// TODO: Add support for URIs w/o scheme (In this case, use the 'default'
@@ -822,4 +820,4 @@
args);
System.exit(res);
}
-}
\ No newline at end of file
+}