From d26bb2660ba4c97a7d7fb0d35f68e1c76abdf780 Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Wed, 14 Nov 2018 16:21:16 +0100 Subject: [PATCH] Interrupt streaming thread, if end of stream is reached Before the thread would just linger around and prevent the download from closing the file --- src/main/java/org/taktik/mpegts/Streamer.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/taktik/mpegts/Streamer.java b/src/main/java/org/taktik/mpegts/Streamer.java index ee5dbcce..d844da92 100644 --- a/src/main/java/org/taktik/mpegts/Streamer.java +++ b/src/main/java/org/taktik/mpegts/Streamer.java @@ -123,8 +123,12 @@ public class Streamer { } } } catch (InterruptedException e1) { - log.error("Interrupted while waiting for packet"); - continue; + if(!endOfSourceReached) { + log.error("Interrupted while waiting for packet"); + continue; + } else { + break; + } } int pid = packet.getPid(); @@ -283,6 +287,7 @@ public class Streamer { log.error("Error reading from source", e); } finally { endOfSourceReached = true; + streamingThread.interrupt(); } }