HCAT-163 NPE when illustrating a relation
git-svn-id: https://svn.apache.org/repos/asf/incubator/hcatalog/trunk@1460850 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 1ef021f..080d22d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -32,6 +32,8 @@
BUG FIXES
+ HCAT-163 NPE when illustrating a relation (daijy)
+
HCAT-628 Committer deletes the original partition when a duplicate partition fails registration (thiruvel via daijy)
HCAT-554 Loading data using HCatLoader() from a table on non default namenode fails. (amalakar via avandana)
diff --git a/core/src/main/java/org/apache/hcatalog/common/HCatUtil.java b/core/src/main/java/org/apache/hcatalog/common/HCatUtil.java
index e9149f7..6447b22 100644
--- a/core/src/main/java/org/apache/hcatalog/common/HCatUtil.java
+++ b/core/src/main/java/org/apache/hcatalog/common/HCatUtil.java
@@ -81,7 +81,8 @@
private final static int DEFAULT_HIVE_CACHE_EXPIRY_TIME_SECONDS = 2 * 60;
public static boolean checkJobContextIfRunningFromBackend(JobContext j) {
- if (j.getConfiguration().get("mapred.task.id", "").equals("")) {
+ if (j.getConfiguration().get("mapred.task.id", "").equals("") &&
+ !("true".equals(j.getConfiguration().get("pig.illustrating")))) {
return false;
}
return true;
