HADOOP-1169. Fix a cut/paste error in the CopyFiles utility so that S3-based source files are correctly copied. Contributed by Michael Stack.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@524184 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -61,6 +61,9 @@ Trunk (unreleased changes)
 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)
 

src/java/org/apache/hadoop/util/CopyFiles.java

@@ -739,16 +739,14 @@ public class CopyFiles extends ToolBase {
         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 @@ public class CopyFiles extends ToolBase {
         args);
     System.exit(res);
   }
-}
+}