svn commit: r899490 - in /hadoop/pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java

[daijy]

Author: daijy
Date: Fri Jan 15 00:09:47 2010
New Revision: 899490

URL: http://svn.apache.org/viewvc?rev=899490&view=rev
Log:
PIG-1186: Pig do not take values in "pig-cluster-hadoop-site.xml"

Modified:
    hadoop/pig/trunk/CHANGES.txt
    
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java

Modified: hadoop/pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=899490&r1=899489&r2=899490&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Fri Jan 15 00:09:47 2010
@@ -343,6 +343,8 @@
 PIG-1185: Data bags do not close spill files after using iterator to read
 tuples (yinghe via daijy)
 
+PIG-1186: Pig do not take values in "pig-cluster-hadoop-site.xml" (daijy)
+
 Release 0.5.0
 
 INCOMPATIBLE CHANGES

Modified: 
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java?rev=899490&r1=899489&r2=899490&view=diff
==============================================================================
--- 
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
 (original)
+++ 
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
 Fri Jan 15 00:09:47 2010
@@ -350,7 +350,14 @@
                 hadoopProperties.put(key, val);
             }
             
+            //clear user defined properties and re-populate
+            properties.clear();
+            Enumeration<Object> hodPropertiesIter = hadoopProperties.keys();
+            while (hodPropertiesIter.hasMoreElements()) {
+                String key = (String) hodPropertiesIter.nextElement();
+                String val = hadoopProperties.getProperty(key);
+                properties.put(key, val);
+            }
         }
-    }
-    
+    }    
 }