From ff98ae24c6ddd28a8dc759e7c18418de6465d2ba Mon Sep 17 00:00:00 2001 From: Leo Ma Date: Mon, 18 Apr 2016 18:54:04 +0800 Subject: [PATCH] Synchronize thread extermination Signed-off-by: Leo Ma --- .../main/java/net/ossrs/sea/rtmp/io/RtmpConnection.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/ossrs/sea/rtmp/io/RtmpConnection.java b/app/src/main/java/net/ossrs/sea/rtmp/io/RtmpConnection.java index ce48de1..29f1ed4 100644 --- a/app/src/main/java/net/ossrs/sea/rtmp/io/RtmpConnection.java +++ b/app/src/main/java/net/ossrs/sea/rtmp/io/RtmpConnection.java @@ -390,6 +390,11 @@ public class RtmpConnection implements RtmpPublisher, PacketRxHandler, ThreadCon } else if (thread instanceof WriteThread && thread.isAlive()) { ((WriteThread) thread).shutdown(); } + try { + thread.join(); + } catch (InterruptedException ie) { + ie.printStackTrace(); + } } } if (socket != null) { @@ -437,4 +442,4 @@ public class RtmpConnection implements RtmpPublisher, PacketRxHandler, ThreadCon audio.getHeader().setAbsoluteTimestamp(dts); writeThread.send(audio); } -} \ No newline at end of file +}