You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/09/28 12:56:56 UTC
flink git commit: [FLINK-7674] Fix NullPointerException in
ContinuousFileMonitoringFunction#close
Repository: flink
Updated Branches:
refs/heads/master 40fbe662c -> 819fe2083
[FLINK-7674] Fix NullPointerException in ContinuousFileMonitoringFunction#close
This closes #4711.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/819fe208
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/819fe208
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/819fe208
Branch: refs/heads/master
Commit: 819fe2083d930b25a21dbaf1897ba9f43616fe9d
Parents: 40fbe66
Author: Bowen Li <bo...@gmail.com>
Authored: Sat Sep 23 18:24:56 2017 -0700
Committer: zentol <ch...@apache.org>
Committed: Thu Sep 28 14:56:11 2017 +0200
----------------------------------------------------------------------
.../functions/source/ContinuousFileMonitoringFunction.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/819fe208/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileMonitoringFunction.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileMonitoringFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileMonitoringFunction.java
index fedd791..9f26efc 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileMonitoringFunction.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileMonitoringFunction.java
@@ -336,9 +336,12 @@ public class ContinuousFileMonitoringFunction<OUT>
@Override
public void close() throws Exception {
super.close();
- synchronized (checkpointLock) {
- globalModificationTime = Long.MAX_VALUE;
- isRunning = false;
+
+ if (checkpointLock != null) {
+ synchronized (checkpointLock) {
+ globalModificationTime = Long.MAX_VALUE;
+ isRunning = false;
+ }
}
if (LOG.isDebugEnabled()) {