svn commit: r1460850 - in /incubator/hcatalog/trunk: CHANGES.txt core/src/main/java/org/apache/hcatalog/common/HCatUtil.java

[daijy]

Author: daijy
Date: Mon Mar 25 19:03:10 2013
New Revision: 1460850

URL: http://svn.apache.org/r1460850
Log:
HCAT-163 NPE when illustrating a relation

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    
incubator/hcatalog/trunk/core/src/main/java/org/apache/hcatalog/common/HCatUtil.java

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1460850&r1=1460849&r2=1460850&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Mon Mar 25 19:03:10 2013
@@ -32,6 +32,8 @@ Trunk (unreleased changes)
 
   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)

Modified: 
incubator/hcatalog/trunk/core/src/main/java/org/apache/hcatalog/common/HCatUtil.java
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/core/src/main/java/org/apache/hcatalog/common/HCatUtil.java?rev=1460850&r1=1460849&r2=1460850&view=diff
==============================================================================
--- 
incubator/hcatalog/trunk/core/src/main/java/org/apache/hcatalog/common/HCatUtil.java
 (original)
+++ 
incubator/hcatalog/trunk/core/src/main/java/org/apache/hcatalog/common/HCatUtil.java
 Mon Mar 25 19:03:10 2013
@@ -81,7 +81,8 @@ public class HCatUtil {
     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;