PIG-5064: NPE in TestScriptUDF#testPythonBuiltinModuleImport1 when JAVA_HOME is not set
git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1770733 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index a6e5c64..196539f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -155,6 +155,8 @@
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)
diff --git a/test/org/apache/pig/test/TestScriptUDF.java b/test/org/apache/pig/test/TestScriptUDF.java
index 726609c..8dc5818 100644
--- a/test/org/apache/pig/test/TestScriptUDF.java
+++ b/test/org/apache/pig/test/TestScriptUDF.java
@@ -247,7 +247,11 @@
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());
}
