From db695bceb3d2dca78380aba3d6132896d7ab957a Mon Sep 17 00:00:00 2001 From: Laurent Garnier Date: Fri, 22 May 2020 11:14:01 +0200 Subject: [PATCH 1/2] [sonos] Removed dependency on 'org.apache.commons.io.IOUtils' Relative to #7722 Signed-off-by: Laurent Garnier --- .../org/openhab/binding/sonos/internal/SonosAudioSink.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosAudioSink.java b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosAudioSink.java index 7eb7d32b31eca..1d31bd96bd016 100644 --- a/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosAudioSink.java +++ b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosAudioSink.java @@ -19,7 +19,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.commons.io.IOUtils; import org.eclipse.smarthome.core.audio.AudioFormat; import org.eclipse.smarthome.core.audio.AudioHTTPServer; import org.eclipse.smarthome.core.audio.AudioSink; @@ -115,7 +114,10 @@ public void process(AudioStream audioStream) logger.warn("We do not have any callback url, so Sonos cannot play the audio stream!"); } } else { - IOUtils.closeQuietly(audioStream); + try { + audioStream.close(); + } catch (IOException e) { + } throw new UnsupportedAudioStreamException( "Sonos can only handle FixedLengthAudioStreams and URLAudioStreams.", audioStream.getClass()); // Instead of throwing an exception, we could ourselves try to wrap it into a From f9d86dabac8210ea66db439606a59f0e03ec6649 Mon Sep 17 00:00:00 2001 From: Laurent Garnier Date: Fri, 22 May 2020 16:25:24 +0200 Subject: [PATCH 2/2] Log added in case of error while closing the audio stream Signed-off-by: Laurent Garnier --- .../java/org/openhab/binding/sonos/internal/SonosAudioSink.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosAudioSink.java b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosAudioSink.java index 1d31bd96bd016..31fd469d76a0e 100644 --- a/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosAudioSink.java +++ b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosAudioSink.java @@ -117,6 +117,7 @@ public void process(AudioStream audioStream) try { audioStream.close(); } catch (IOException e) { + logger.debug("Error while closing the audio stream: {}", e.getMessage()); } throw new UnsupportedAudioStreamException( "Sonos can only handle FixedLengthAudioStreams and URLAudioStreams.", audioStream.getClass());