svn commit: r1736096 - in /pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java

[daijy]

Author: daijy
Date: Mon Mar 21 21:07:13 2016
New Revision: 1736096

URL: http://svn.apache.org/viewvc?rev=1736096&view=rev
Log:
PIG-4832: Fix TestPrumeColumn NPE failure

Modified:
    pig/trunk/CHANGES.txt
    
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1736096&r1=1736095&r2=1736096&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Mar 21 21:07:13 2016
@@ -99,6 +99,8 @@ PIG-4639: Add better parser for Apache H
 
 BUG FIXES
 
+PIG-4832: Fix TestPrumeColumn NPE failure (kellyzly via daijy)
+
 PIG-4833 TestBuiltin.testURIWithCurlyBrace in TEZ failing after PIG-4819 
(knoguchi)
 
 PIG-4819: RANDOM() udf can lead to missing or redundant records (knoguchi)

Modified: 
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java?rev=1736096&r1=1736095&r2=1736096&view=diff
==============================================================================
--- 
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java
 (original)
+++ 
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java
 Mon Mar 21 21:07:13 2016
@@ -247,9 +247,11 @@ public class POStore extends PhysicalOpe
 
 
     public StoreFuncInterface getStoreFunc() {
-        if(storer == null){
-            storer = 
(StoreFuncInterface)PigContext.instantiateFuncFromSpec(sFile.getFuncSpec());
+        if (storer == null) {
+            storer = (StoreFuncInterface) 
PigContext.instantiateFuncFromSpec(sFile.getFuncSpec());
             storer.setStoreFuncUDFContextSignature(signature);
+        }
+        if (sDecorator == null) {
             // Init the Decorator we use for writing Tuples
             setStoreFuncDecorator(new StoreFuncDecorator(storer, signature));
         }