From bd4ba6af49fcef653a98df718470abea5f2570ad Mon Sep 17 00:00:00 2001
From: mlobstein <michael.lobstein@gmail.com>
Date: Tue, 6 Jul 2021 12:46:25 -0500
Subject: [PATCH] [tivo] Fix thing staying offline after connection refresh
 (#10902)

Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>
---
 .../org/openhab/binding/tivo/internal/handler/TiVoHandler.java | 1 +
 .../binding/tivo/internal/service/TivoStatusProvider.java      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

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 4546be62fa010..c38a8871bf2fb 100644
--- 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 void handleCommand(ChannelUID channelUID, Command command) {
     }
 
     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 b831649333bf2..ae3e70cf74121 100644
--- 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.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 void run() {
 
                     try {
                         receivedData = reader.readLine();
-                    } catch (SocketTimeoutException e) {
+                    } catch (SocketTimeoutException | SocketException e) {
                         // Do nothing. Just allow the thread to check if it has to stop.
                     }