You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ch...@apache.org on 2014/02/26 21:44:30 UTC

svn commit: r1572246 - in /pig/branches/branch-0.12: CHANGES.txt src/org/apache/pig/parser/LogicalPlanBuilder.java

Author: cheolsoo
Date: Wed Feb 26 20:44:30 2014
New Revision: 1572246

URL: http://svn.apache.org/r1572246
Log:
PIG-3779: Assert constructs ConstantExpression with null when no comment is given (thedatachef via cheolsoo)

Modified:
    pig/branches/branch-0.12/CHANGES.txt
    pig/branches/branch-0.12/src/org/apache/pig/parser/LogicalPlanBuilder.java

Modified: pig/branches/branch-0.12/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.12/CHANGES.txt?rev=1572246&r1=1572245&r2=1572246&view=diff
==============================================================================
--- pig/branches/branch-0.12/CHANGES.txt (original)
+++ pig/branches/branch-0.12/CHANGES.txt Wed Feb 26 20:44:30 2014
@@ -34,6 +34,8 @@ PIG-3480: TFile-based tmpfile compressio
 
 BUG FIXES
 
+PIG-3779: Assert constructs ConstantExpression with null when no comment is given (thedatachef via cheolsoo)
+
 PIG-3777: Pig 12.0 Documentation (karinahauser via daijy)
 
 PIG-3774: Piggybank Over UDF get wrong result (daijy)

Modified: pig/branches/branch-0.12/src/org/apache/pig/parser/LogicalPlanBuilder.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.12/src/org/apache/pig/parser/LogicalPlanBuilder.java?rev=1572246&r1=1572245&r2=1572246&view=diff
==============================================================================
--- pig/branches/branch-0.12/src/org/apache/pig/parser/LogicalPlanBuilder.java (original)
+++ pig/branches/branch-0.12/src/org/apache/pig/parser/LogicalPlanBuilder.java Wed Feb 26 20:44:30 2014
@@ -981,7 +981,7 @@ public class LogicalPlanBuilder {
             ConstantExpression rhs = new ConstantExpression(exprPlan, new Boolean(false));
             BinCondExpression binCond = new BinCondExpression(exprPlan, expr, lhs, rhs);
             args.add(binCond);
-            ConstantExpression constExpr = new ConstantExpression(exprPlan, comment);
+            ConstantExpression constExpr = new ConstantExpression(exprPlan, (comment == null ? "" : comment));
             args.add(constExpr);
             UserFuncExpression udf = new UserFuncExpression(exprPlan, new FuncSpec( Assert.class.getName() ), args );
             exprPlan.add(udf);