HADOOP-3165. -put/-copyFromLocal did not treat input file - as stdin. (Lohit Vijayarenu via rangadi)

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

CHANGES.txt

@@ -482,6 +482,9 @@ Trunk (unreleased changes)
     HADOOP-3146. A DFSOutputStream.flush method is renamed as
     DFSOutputStream.fsync.  (dhruba)
 
+    HADOOP-3165. -put/-copyFromLocal did not treat input file "-" as stdin.
+    (Lohit Vijayarenu via rangadi)
+
 Release 0.16.2 - 2008-04-02
 
   BUG FIXES

src/java/org/apache/hadoop/fs/FsShell.java

@@ -128,22 +128,12 @@ public class FsShell extends Configured implements Tool {
   void copyFromLocal(Path[] srcs, String dstf) throws IOException {
     Path dstPath = new Path(dstf);
     FileSystem dstFs = dstPath.getFileSystem(getConf());
-    dstFs.copyFromLocalFile(false, false, srcs, dstPath);
-  }
-  
-  /**
-   * Add a local file to the indicated FileSystem name. src is kept.
-   */
-  void copyFromLocal(Path src, String dstf) throws IOException {
-    if (src.toString().equals("-")) {
-      Path dstPath = new Path(dstf);
-      FileSystem dstFs = dstPath.getFileSystem(getConf());
+    if (srcs.length == 1 && srcs[0].toString().equals("-"))
       copyFromStdin(dstPath, dstFs);
-    } else {
-      copyFromLocal(new Path[]{src}, dstf);
-    }
+    else
+      dstFs.copyFromLocalFile(false, false, srcs, dstPath);
   }
-
+  
   /**
    * Add local files to the indicated FileSystem name. src is removed.
    */