[oceanic] Removed dependency on 'org.apache.commons.io.IOUtils' (open…

…hab#7732) Relative to openhab#7722 Let the socket closure close the in/out streams Signed-off-by: Laurent Garnier <lg.hc@free.fr> Signed-off-by: CSchlipp <christian@schlipp.de>
CSchlipp · Jul 26, 2020 · a01c689 · a01c689
1 parent 9ae6a79
commit a01c689
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/...rc/main/java/org/openhab/binding/oceanic/internal/handler/NetworkOceanicThingHandler.java b/...rc/main/java/org/openhab/binding/oceanic/internal/handler/NetworkOceanicThingHandler.java
@@ -21,7 +21,6 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.smarthome.core.thing.Thing;
 import org.eclipse.smarthome.core.thing.ThingStatus;
@@ -83,8 +82,6 @@ public void initialize() {
  public void dispose() {
  NetworkOceanicBindingConfiguration config = getConfigAs(NetworkOceanicBindingConfiguration.class);
 
- IOUtils.closeQuietly(inputStream);
- IOUtils.closeQuietly(outputStream);
  if (socket != null) {
  try {
  socket.close();
@@ -93,6 +90,8 @@ public void dispose() {
  config.portNumber, e.getMessage());
  } finally {
  socket = null;
+ outputStream = null;
+ inputStream = null;
  }
  }
 

diff --git a/...src/main/java/org/openhab/binding/oceanic/internal/handler/SerialOceanicThingHandler.java b/...src/main/java/org/openhab/binding/oceanic/internal/handler/SerialOceanicThingHandler.java
@@ -19,7 +19,6 @@
 import java.util.Arrays;
 import java.util.Enumeration;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.smarthome.core.thing.Thing;
 import org.eclipse.smarthome.core.thing.ThingStatus;
@@ -149,12 +148,29 @@ public void dispose() {
  }
  }
 
- IOUtils.closeQuietly(inputStream);
- IOUtils.closeQuietly(outputStream);
+ if (inputStream != null) {
+ try {
+ inputStream.close();
+ } catch (IOException e) {
+ logger.debug("Error while closing the input stream: {}", e.getMessage());
+ }
+ }
+ if (outputStream != null) {
+ try {
+ outputStream.close();
+ } catch (IOException e) {
+ logger.debug("Error while closing the output stream: {}", e.getMessage());
+ }
+ }
  if (serialPort != null) {
  serialPort.close();
  }
 
+ readerThread = null;
+ inputStream = null;
+ outputStream = null;
+ serialPort = null;
+
  super.dispose();
  }
 
@@ -224,7 +240,6 @@ public void interrupt() {
  logger.trace("Interrupting the SerialPortReader");
  interrupted = true;
  super.interrupt();
- IOUtils.closeQuietly(inputStream);
  }
 
  @Override