svn commit: r1737532 - /pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/converter/LoadConverter.java

[xuefu]

Author: xuefu
Date: Sat Apr  2 21:55:44 2016
New Revision: 1737532

URL: http://svn.apache.org/viewvc?rev=1737532&view=rev
Log:
PIG-4059: pig.noSplitCombination=true should always be set internally for a 
merge join (Xianda Via Xuefu)

Modified:
    
pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/converter/LoadConverter.java

Modified: 
pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/converter/LoadConverter.java
URL: 
http://svn.apache.org/viewvc/pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/converter/LoadConverter.java?rev=1737532&r1=1737531&r2=1737532&view=diff
==============================================================================
--- 
pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/converter/LoadConverter.java
 (original)
+++ 
pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/converter/LoadConverter.java
 Sat Apr  2 21:55:44 2016
@@ -226,6 +226,9 @@ public class LoadConverter implements RD
     }
 
     private static boolean hasMergeJoinSuccessor(PhysicalOperator op) {
+        if (op == null || op.getParentPlan() == null) {
+            return false;
+        }
         List<PhysicalOperator> successors = 
op.getParentPlan().getSuccessors(op);
         if (successors == null ) {
             return false;