From: J-N-K <github@klug.nrw>
Date: Thu, 2 Mar 2023 19:57:02 +0000 (+0100)
Subject: [exec] Fix whitelist not read (#14522)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=44634a6e89135adedee78bca76b242cea648877d;p=openhab-addons.git

[exec] Fix whitelist not read (#14522)

Signed-off-by: Jan N. Klug <github@klug.nrw>
---

diff --git a/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecWhitelistWatchService.java b/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecWhitelistWatchService.java
index 180b425c7e..6220459f6b 100644
--- a/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecWhitelistWatchService.java
+++ b/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecWhitelistWatchService.java
@@ -43,11 +43,13 @@ public class ExecWhitelistWatchService implements WatchService.WatchEventListene
     private final Logger logger = LoggerFactory.getLogger(ExecWhitelistWatchService.class);
     private final Set<String> commandWhitelist = new HashSet<>();
     private final WatchService watchService;
+    private final Path watchFile;
 
     @Activate
     public ExecWhitelistWatchService(
             final @Reference(target = WatchService.CONFIG_WATCHER_FILTER) WatchService watchService) {
         this.watchService = watchService;
+        this.watchFile = watchService.getWatchPath().resolve(COMMAND_WHITELIST_FILE);
         watchService.registerListener(this, COMMAND_WHITELIST_FILE, false);
 
         // read initial content
@@ -61,9 +63,9 @@ public class ExecWhitelistWatchService implements WatchService.WatchEventListene
 
     @Override
     public void processWatchEvent(WatchService.Kind kind, Path path) {
-        if (path.endsWith(COMMAND_WHITELIST_FILE)) {
-            commandWhitelist.clear();
-            try (Stream<String> lines = Files.lines(path)) {
+        commandWhitelist.clear();
+        if (kind != WatchService.Kind.DELETE) {
+            try (Stream<String> lines = Files.lines(watchFile)) {
                 lines.filter(line -> !line.trim().startsWith("#")).forEach(commandWhitelist::add);
                 logger.debug("Updated command whitelist: {}", commandWhitelist);
             } catch (IOException e) {