From 84b22c9c99ea87a74a786861034997954e497a7f Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Tue, 12 Jun 2018 10:13:30 +0200 Subject: [PATCH] fix: prevent hiding original exception when MUC start fails. When starting/joining a MUC fails, 'leave' is called as part of the exception handling. In case 'leave' throws an exception, this exception should not be thrown instead of the original exception that was thrown when start failed. --- .../org/jitsi/jicofo/JitsiMeetConferenceImpl.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java b/src/main/java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java index a1566d6472..cdcef0d6c0 100644 --- a/src/main/java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java +++ b/src/main/java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java @@ -364,7 +364,18 @@ public synchronized void start() } catch (Exception e) { - stop(); + try + { + stop(); + } + catch (Exception x) + { + logger.warn("An exception was caught while invoking stop()" + + " as part of handling another exception that occurred" + + " while invoking start(). This is the exception that" + + " stop() threw (start()'s exception will be thrown" + + " next).", x); + } throw e; }