This is an automated email from the ASF dual-hosted git repository. penghui pushed a commit to branch branch-2.10 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 4639b15c1de5c7878904eddb34caed821a3d6f5c Author: Neng Lu <[email protected]> AuthorDate: Wed Apr 20 23:23:44 2022 -0700 [Functions] Check executor null when closing the FileSource (#15247) (cherry picked from commit 06ba587fb92eff81785f8d463c85aaa1095292e9) --- .../src/main/java/org/apache/pulsar/io/file/FileSource.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileSource.java b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileSource.java index 9ba85f3ed71..a67e3195ad7 100644 --- a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileSource.java +++ b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/FileSource.java @@ -57,13 +57,15 @@ public class FileSource extends PushSource<byte[]> { @Override public void close() throws Exception { - executor.shutdown(); - try { - if (!executor.awaitTermination(800, TimeUnit.MILLISECONDS)) { + if (executor != null) { + executor.shutdown(); + try { + if (!executor.awaitTermination(800, TimeUnit.MILLISECONDS)) { + executor.shutdownNow(); + } + } catch (InterruptedException e) { executor.shutdownNow(); } - } catch (InterruptedException e) { - executor.shutdownNow(); } } }
