You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2014/09/09 03:33:43 UTC

svn commit: r1623608 - in /pig/trunk: CHANGES.txt src/org/apache/pig/impl/io/FileLocalizer.java

Author: daijy
Date: Tue Sep  9 01:33:43 2014
New Revision: 1623608

URL: http://svn.apache.org/r1623608
Log:
PIG-4156: [PATCH] fix NPE when running scripts stored on hdfs://

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/impl/io/FileLocalizer.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1623608&r1=1623607&r2=1623608&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Sep  9 01:33:43 2014
@@ -70,6 +70,8 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-4156: [PATCH] fix NPE when running scripts stored on hdfs:// (acoliver via daijy)
+
 PIG-4159: TestGroupConstParallelTez and TestJobSubmissionTez should be excluded in Hadoop 20 unit tests (cheolsoo)
 
 PIG-4154: ScriptState#setScript(File) does not close resources (lars_francke via daijy)

Modified: pig/trunk/src/org/apache/pig/impl/io/FileLocalizer.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/io/FileLocalizer.java?rev=1623608&r1=1623607&r2=1623608&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/impl/io/FileLocalizer.java (original)
+++ pig/trunk/src/org/apache/pig/impl/io/FileLocalizer.java Tue Sep  9 01:33:43 2014
@@ -800,7 +800,8 @@ public class FileLocalizer {
                 && uri.getScheme() == null )||
                 // For Windows local files
                 (uri.getScheme() == null && uri.getPath().matches("^/[A-Za-z]:.*")) ||
-                uri.getScheme().equals("local") ) {
+                (uri.getScheme() != null && uri.getScheme().equals("local")) 
+            ) {
             srcFs = localFs;
         } else {
             srcFs = path.getFileSystem(conf);