From dc5d76d762e9073f6291e31f5031ab86f933e0ae Mon Sep 17 00:00:00 2001
From: goopilot <40123561+goopilot@users.noreply.github.com>
Date: Wed, 3 May 2023 01:10:46 -0500
Subject: [PATCH] fix s3 thing status (#14925)

Signed-off-by: Alexandr Salamatov <goopilot@gmail.com>
---
 .../openhab/binding/folderwatcher/internal/api/S3Actions.java   | 2 +-
 .../folderwatcher/internal/handler/S3BucketWatcherHandler.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/api/S3Actions.java b/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/api/S3Actions.java
index c005092e6a..131ac7f798 100644
--- a/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/api/S3Actions.java
+++ b/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/api/S3Actions.java
@@ -115,7 +115,7 @@ public class S3Actions {
         List<String> returnList = new ArrayList<>();
 
         if (nameNodesList.getLength() == 0) {
-            throw new Exception("No files deceted in the bucket");
+            return returnList;
         }
 
         for (int i = 0; i < nameNodesList.getLength(); i++) {
diff --git a/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/handler/S3BucketWatcherHandler.java b/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/handler/S3BucketWatcherHandler.java
index f7e7148477..9d89786bbb 100644
--- a/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/handler/S3BucketWatcherHandler.java
+++ b/bundles/org.openhab.binding.folderwatcher/src/main/java/org/openhab/binding/folderwatcher/internal/handler/S3BucketWatcherHandler.java
@@ -89,7 +89,6 @@ public class S3BucketWatcherHandler extends BaseThingHandler {
 
         if (refreshS3BucketInformation()) {
             if (config.pollIntervalS3 > 0) {
-                updateStatus(ThingStatus.ONLINE);
                 executionJob = scheduler.scheduleWithFixedDelay(this::refreshS3BucketInformation, config.pollIntervalS3,
                         config.pollIntervalS3, TimeUnit.SECONDS);
             } else {
@@ -104,6 +103,7 @@ public class S3BucketWatcherHandler extends BaseThingHandler {
         List<String> currentS3Listing = new ArrayList<>();
         try {
             currentS3Listing = s3.listBucket(config.s3Path);
+            updateStatus(ThingStatus.ONLINE);
             List<String> difS3Listing = new ArrayList<>(currentS3Listing);
             difS3Listing.removeAll(previousS3Listing);
             difS3Listing.forEach(file -> triggerChannel(CHANNEL_NEWFILE, file));
-- 
2.47.3