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

[gates]

Author: gates
Date: Tue Jan  1 00:14:03 2013
New Revision: 1427261

URL: http://svn.apache.org/viewvc?rev=1427261&view=rev
Log:
HCATALOG-477 HCatContext causes persistance of undesired jobConf parameters

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

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1427261&r1=1427260&r2=1427261&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Tue Jan  1 00:14:03 2013
@@ -168,6 +168,8 @@ Release 0.5.0 - Unreleased
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-577 HCatContext causes persistance of undesired jobConf parameters 
(khorgath via gates)
+
   HCAT-584 Changes in HCAT-538 break Pig stores into non-partitioned tables 
(gates)
 
   HCAT-576 HCATALOG-527 Broke backward compatibility (gates)

Modified: 
incubator/hcatalog/trunk/core/src/main/java/org/apache/hcatalog/common/HCatContext.java
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/core/src/main/java/org/apache/hcatalog/common/HCatContext.java?rev=1427261&r1=1427260&r2=1427261&view=diff
==============================================================================
--- 
incubator/hcatalog/trunk/core/src/main/java/org/apache/hcatalog/common/HCatContext.java
 (original)
+++ 
incubator/hcatalog/trunk/core/src/main/java/org/apache/hcatalog/common/HCatContext.java
 Tue Jan  1 00:14:03 2013
@@ -66,7 +66,7 @@ public enum HCatContext {
 
         if (conf != newConf) {
             for (Map.Entry<String, String> entry : conf) {
-                if (newConf.get(entry.getKey()) == null) {
+                if ((entry.getKey().matches("hcat.*")) && 
(newConf.get(entry.getKey()) == null)) {
                     newConf.set(entry.getKey(), entry.getValue());
                 }
             }