svn commit: r1550588 - /hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java

[hashutosh]

Author: hashutosh
Date: Thu Dec 12 23:30:10 2013
New Revision: 1550588

URL: http://svn.apache.org/r1550588
Log:
HIVE-6016 : Hadoop23Shims has a bug in listLocatedStatus impl. (Prasanth J via 
Ashutosh Chauhan)

Modified:
    
hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java

Modified: 
hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
URL: 
http://svn.apache.org/viewvc/hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java?rev=1550588&r1=1550587&r2=1550588&view=diff
==============================================================================
--- 
hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
 (original)
+++ 
hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
 Thu Dec 12 23:30:10 2013
@@ -37,13 +37,11 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.PathFilter;
 import org.apache.hadoop.fs.ProxyFileSystem;
 import org.apache.hadoop.fs.RemoteIterator;
-import org.apache.hadoop.fs.LocatedFileStatus;
-import org.apache.hadoop.fs.RemoteIterator;
 import org.apache.hadoop.fs.Trash;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.mapred.MiniMRCluster;
 import org.apache.hadoop.mapred.ClusterStatus;
 import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.MiniMRCluster;
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.WebHCatJTShim23;
 import org.apache.hadoop.mapreduce.Job;
@@ -362,10 +360,12 @@ public class Hadoop23Shims extends Hadoo
           fs.listLocatedStatus(path);
       private FileStatus next;
       {
-        if (inner.hasNext()) {
+        next = null;
+        while (inner.hasNext() && next == null) {
           next = inner.next();
-        } else {
-          next = null;
+          if (filter != null && !filter.accept(next.getPath())) {
+            next = null;
+          }
         }
       }