From 5e7f32b732fee3d313289d698a47daf75e1f4b1f Mon Sep 17 00:00:00 2001 From: Jan Pichl Date: Mon, 22 Jun 2015 19:03:31 +0200 Subject: [PATCH] Repaired error caused by deletion of file with insufficient permissions. --- .gitignore | 2 ++ src/main/java/info/fetter/logstashforwarder/FileWatcher.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c52aa7a..5d5e58d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /bin/ /testFileReader1.txt /state2.json +.idea/ +logstash-forwarder-java.iml \ No newline at end of file diff --git a/src/main/java/info/fetter/logstashforwarder/FileWatcher.java b/src/main/java/info/fetter/logstashforwarder/FileWatcher.java index 3d5f0c0..0744388 100644 --- a/src/main/java/info/fetter/logstashforwarder/FileWatcher.java +++ b/src/main/java/info/fetter/logstashforwarder/FileWatcher.java @@ -298,7 +298,8 @@ public class FileWatcher { public void onFileDelete(File file) { try { logger.debug("Delete detected on file : " + file.getCanonicalPath()); - oldWatchMap.get(file).setDeleted(); + FileState state = oldWatchMap.get(file); + if (state != null) state.setDeleted(); } catch (IOException e) { logger.error("Caught IOException : " + e.getMessage()); }