[tivo] Fix thing staying offline after connection refresh (#10902)

Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>

diff --git a/bundles/org.openhab.binding.tivo/src/main/java/org/openhab/binding/tivo/internal/handler/TiVoHandler.java b/bundles/org.openhab.binding.tivo/src/main/java/org/openhab/binding/tivo/internal/handler/TiVoHandler.java
index 4546be62fa01040574ab6b2695dd1a3d648e6947..c38a8871bf2fba9eacee700b7cea3678f58c5a3c 100644 (file)
--- a/bundles/org.openhab.binding.tivo/src/main/java/org/openhab/binding/tivo/internal/handler/TiVoHandler.java
+++ b/bundles/org.openhab.binding.tivo/src/main/java/org/openhab/binding/tivo/internal/handler/TiVoHandler.java
@@ -115,6 +115,7 @@ public class TiVoHandler extends BaseThingHandler {
     }
 
     public void setStatusOffline() {
+        lastConnectionStatus = ConnectionStatus.UNKNOWN;
         this.updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
                 "Power on device or check network configuration/connection.");
     }

diff --git a/bundles/org.openhab.binding.tivo/src/main/java/org/openhab/binding/tivo/internal/service/TivoStatusProvider.java b/bundles/org.openhab.binding.tivo/src/main/java/org/openhab/binding/tivo/internal/service/TivoStatusProvider.java
index b831649333bf29b0340ec00c52ca941d3aa2b6ad..ae3e70cf74121eeb389f0789eacd14258f90f04a 100644 (file)
--- a/bundles/org.openhab.binding.tivo/src/main/java/org/openhab/binding/tivo/internal/service/TivoStatusProvider.java
+++ b/bundles/org.openhab.binding.tivo/src/main/java/org/openhab/binding/tivo/internal/service/TivoStatusProvider.java
@@ -20,6 +20,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.net.Socket;
+import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 import java.util.concurrent.TimeUnit;
@@ -441,7 +442,7 @@ public class TivoStatusProvider {
 
                     try {
                         receivedData = reader.readLine();
-                    } catch (SocketTimeoutException e) {
+                    } catch (SocketTimeoutException | SocketException e) {
                         // Do nothing. Just allow the thread to check if it has to stop.
                     }