[FLINK-21944][python] Perform null check before closing arrowSerializer

deepfield · Mar 24, 2021 · 0e04b2e · 0e04b2e
1 parent ddfcce7
commit 0e04b2e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/...g/apache/flink/table/runtime/functions/python/arrow/ArrowPythonScalarFunctionFlatMap.java b/...g/apache/flink/table/runtime/functions/python/arrow/ArrowPythonScalarFunctionFlatMap.java
@@ -78,7 +78,10 @@ public void close() throws Exception {
  try {
  super.close();
  } finally {
- arrowSerializer.close();
+ if (arrowSerializer != null) {
+ arrowSerializer.close();
+ arrowSerializer = null;
+ }
  }
  }
 

diff --git a/...untime/operators/python/aggregate/arrow/AbstractArrowPythonAggregateFunctionOperator.java b/...untime/operators/python/aggregate/arrow/AbstractArrowPythonAggregateFunctionOperator.java
@@ -102,7 +102,10 @@ public void open() throws Exception {
  @Override
  public void dispose() throws Exception {
  super.dispose();
- arrowSerializer.close();
+ if (arrowSerializer != null) {
+ arrowSerializer.close();
+ arrowSerializer = null;
+ }
  }
 
  @Override

diff --git a/.../flink/table/runtime/operators/python/scalar/arrow/ArrowPythonScalarFunctionOperator.java b/.../flink/table/runtime/operators/python/scalar/arrow/ArrowPythonScalarFunctionOperator.java
@@ -75,7 +75,10 @@ protected void invokeFinishBundle() throws Exception {
  @Override
  public void dispose() throws Exception {
  super.dispose();
- arrowSerializer.close();
+ if (arrowSerializer != null) {
+ arrowSerializer.close();
+ arrowSerializer = null;
+ }
  }
 
  @Override

diff --git a/...table/runtime/operators/python/scalar/arrow/RowDataArrowPythonScalarFunctionOperator.java b/...table/runtime/operators/python/scalar/arrow/RowDataArrowPythonScalarFunctionOperator.java
@@ -82,7 +82,10 @@ public void endInput() throws Exception {
  @Override
  public void dispose() throws Exception {
  super.dispose();
- arrowSerializer.close();
+ if (arrowSerializer != null) {
+ arrowSerializer.close();
+ arrowSerializer = null;
+ }
  }
 
  @Override