[lirc] Removed dependency on 'org.apache.commons.io.IOUtils' (openhab…

…#7733) Relative to openhab#7722 Let the socket closure close the in/out streams Signed-off-by: Laurent Garnier <[email protected]>
LoungeFlyZ · Jun 8, 2020 · 970c0c5 · 970c0c5
1 parent 60af9a5
commit 970c0c5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/...binding.lirc/src/main/java/org/openhab/binding/lirc/internal/connector/LIRCConnector.java b/...binding.lirc/src/main/java/org/openhab/binding/lirc/internal/connector/LIRCConnector.java
@@ -21,7 +21,6 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import org.apache.commons.io.IOUtils;
 import org.openhab.binding.lirc.internal.config.LIRCBridgeConfiguration;
 import org.openhab.binding.lirc.internal.messages.LIRCButtonEvent;
 import org.openhab.binding.lirc.internal.messages.LIRCResponse;
@@ -75,23 +74,19 @@ public void disconnect() {
         }
         if (outWriter != null) {
             logger.debug("Close print writer stream");
-            IOUtils.closeQuietly(outWriter);
+            outWriter.close();
             outWriter = null;
         }
-        if (out != null) {
-            logger.debug("Close tcp out stream");
-            IOUtils.closeQuietly(out);
-            out = null;
-        }
-        if (in != null) {
-            logger.debug("Close tcp in stream");
-            IOUtils.closeQuietly(in);
-            in = null;
-        }
         if (socket != null) {
             logger.debug("Close socket");
-            IOUtils.closeQuietly(socket);
+            try {
+                socket.close();
+            } catch (IOException e) {
+                logger.debug("Error while closing the socket: {}", e.getMessage());
+            }
             socket = null;
+            out = null;
+            in = null;
         }
         logger.debug("Disconnected");
     }

diff --git a/...ding.lirc/src/main/java/org/openhab/binding/lirc/internal/connector/LIRCStreamReader.java b/...ding.lirc/src/main/java/org/openhab/binding/lirc/internal/connector/LIRCStreamReader.java
@@ -22,7 +22,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.io.IOUtils;
 import org.openhab.binding.lirc.internal.LIRCResponseException;
 import org.openhab.binding.lirc.internal.messages.LIRCButtonEvent;
 import org.openhab.binding.lirc.internal.messages.LIRCResponse;
@@ -104,7 +103,11 @@ public void run() {
                 logger.error("Invalid message received", e);
             }
         }
-        IOUtils.closeQuietly(reader);
+        try {
+            reader.close();
+        } catch (IOException e) {
+            logger.debug("Error while closing the input stream: {}", e.getMessage());
+        }
     }
 
     private void processResponse(String responseText) throws LIRCResponseException {