diff --git a/pom.xml b/pom.xml index 711ca94b3..fd4dee50a 100644 --- a/pom.xml +++ b/pom.xml @@ -22,8 +22,8 @@ 4.4.6 1.0.3 - 1.1-133-g768ef2e - 11.0.14 + 1.1-140-g8f45a9f + 11.0.20 @@ -270,16 +270,6 @@ commons-lang3 3.12.0 - - org.apache.httpcomponents - httpcore - 4.4.15 - - - org.apache.httpcomponents - httpclient - 4.5.13 - ${jitsi-desktop.groupId} diff --git a/src/main/java/org/jitsi/jigasi/JvbConference.java b/src/main/java/org/jitsi/jigasi/JvbConference.java index 9c608f2d9..4166d490a 100644 --- a/src/main/java/org/jitsi/jigasi/JvbConference.java +++ b/src/main/java/org/jitsi/jigasi/JvbConference.java @@ -1965,6 +1965,12 @@ public void setLobbyEnabled(boolean value) */ private String getMeetingId() { + // in case when running unittests + if (this.getConnection() == null) + { + return null; + } + if (this.meetingId == null) { try @@ -1994,6 +2000,12 @@ private String getMeetingId() */ private void updateFromRoomConfiguration() { + // in case when running unittests + if (this.getConnection() == null) + { + return; + } + try { DiscoverInfo info = ServiceDiscoveryManager.getInstanceFor(getConnection()).