You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2022/04/28 14:11:21 UTC
[pulsar] 10/15: [Functions] Check executor null when closing the FileSource (#15247)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.8
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 55323cac8724fe6621b58601db67df210546a2ed
Author: Neng Lu <nl...@streamnative.io>
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 bc09c978dd6..3a51736cc2a 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
@@ -58,13 +58,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();
}
}
}