Use instead of GeneratedExpression's nullTerm

apache · Dec 20, 2019 · c819f09 · c819f09
1 parent 4d89fc7
commit c819f09
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...link/src/main/scala/org/apache/flink/table/planner/codegen/calls/ScalarOperatorGens.scala b/...link/src/main/scala/org/apache/flink/table/planner/codegen/calls/ScalarOperatorGens.scala
@@ -1287,17 +1287,17 @@ object ScalarOperatorGens {
            |boolean $nullTerm;
            |if (${condition.resultTerm}) {
            |  ${trueAction.code}
-           |  if (!${trueAction.nullTerm}) {
+           |  $nullTerm = ${trueAction.nullTerm};
+           |  if (!$nullTerm) {
            |    $resultTerm = ${trueAction.resultTerm};
            |  }
-           |  $nullTerm = ${trueAction.nullTerm};
            |}
            |else {
            |  ${falseAction.code}
-           |  if (!${falseAction.nullTerm}) {
+           |  $nullTerm = ${falseAction.nullTerm};
+           |  if (!$nullTerm) {
            |    $resultTerm = ${falseAction.resultTerm};
            |  }
-           |  $nullTerm = ${falseAction.nullTerm};
            |}
            |""".stripMargin.trim
       }