svn commit: r1770733 - in /pig/trunk: CHANGES.txt test/org/apache/pig/test/TestScriptUDF.java

[daijy]

Author: daijy
Date: Mon Nov 21 18:37:14 2016
New Revision: 1770733

URL: http://svn.apache.org/viewvc?rev=1770733&view=rev
Log:
PIG-5064: NPE in TestScriptUDF#testPythonBuiltinModuleImport1 when JAVA_HOME is 
not set

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/test/org/apache/pig/test/TestScriptUDF.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1770733&r1=1770732&r2=1770733&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Nov 21 18:37:14 2016
@@ -155,6 +155,8 @@ OPTIMIZATIONS
 
 BUG FIXES
 
+PIG-5064: NPE in TestScriptUDF#testPythonBuiltinModuleImport1 when JAVA_HOME 
is not set (water via daijy)
+
 PIG-5048: HiveUDTF fail if it is the first expression in projection (nkollar 
via daijy)
 
 PIG-4951: Rename PIG_ATS_ENABLED constant (szita via daijy)

Modified: pig/trunk/test/org/apache/pig/test/TestScriptUDF.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestScriptUDF.java?rev=1770733&r1=1770732&r2=1770733&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestScriptUDF.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestScriptUDF.java Mon Nov 21 18:37:14 
2016
@@ -247,7 +247,11 @@ public class TestScriptUDF{
         Assert.assertTrue(t.get(0).toString().equals(System.getenv(input[0])));
         Assert.assertTrue(iter.hasNext());
         t = iter.next();
-        Assert.assertTrue(t.get(0).toString().equals(System.getenv(input[1])));
+        if (System.getenv(input[1]) != null) {  // JAVA_HOME is set, t.get(0) 
is not null
+            
Assert.assertTrue(t.get(0).toString().equals(System.getenv(input[1])));
+        } else {  // JAVA_HOME is not set, t.get(0) is null
+            Assert.assertNull(t.get(0));
+        }
         Assert.assertFalse(iter.hasNext());
     }