diff --git a/src/main/java/org/jitsi/impl/reservation/rest/ApiHandler.java b/src/main/java/org/jitsi/impl/reservation/rest/ApiHandler.java index 4c67bfc281..8b0b597ea3 100644 --- a/src/main/java/org/jitsi/impl/reservation/rest/ApiHandler.java +++ b/src/main/java/org/jitsi/impl/reservation/rest/ApiHandler.java @@ -22,6 +22,7 @@ import org.apache.http.NameValuePair; import org.apache.http.client.entity.*; import org.apache.http.client.methods.*; +import org.apache.http.impl.*; import org.apache.http.impl.client.*; import org.apache.http.message.*; import org.apache.http.util.*; @@ -57,7 +58,10 @@ public class ApiHandler /** * HTTP client used for sending requests. */ - private final CloseableHttpClient client = HttpClientBuilder.create().build(); + private final CloseableHttpClient client = HttpClientBuilder + .create() + .setConnectionReuseStrategy(NoConnectionReuseStrategy.INSTANCE) + .build(); /** * JSON handler for Conference objects. @@ -113,7 +117,7 @@ public ApiResult createNewConference(String ownerEmail, entry.getKey(), String.valueOf(entry.getValue()))); } - post.setEntity(new UrlEncodedFormEntity(nameValuePairs, "UTF8")); + post.setEntity(new UrlEncodedFormEntity(nameValuePairs, "UTF-8")); logger.info("Sending post: " + jsonMap); @@ -190,7 +194,7 @@ public ApiResult getConference(Number conferenceId) return new ApiResult(statusCode, error); } } - finally + finally { if (response != null && response.getEntity() != null) { diff --git a/src/main/java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java b/src/main/java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java index ee7ece568a..6e11a587d1 100644 --- a/src/main/java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java +++ b/src/main/java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java @@ -1063,7 +1063,7 @@ private void onMemberLeft(ChatRoomMember chatRoomMember) Reason.GONE, null, /* no need to send session-terminate - gone */ false, - /* no need to send source-remove */ false); + /* no need to send source-remove */ true); } else { diff --git a/src/main/java/org/jitsi/jicofo/auth/AbstractAuthAuthority.java b/src/main/java/org/jitsi/jicofo/auth/AbstractAuthAuthority.java index ea56296cfe..f117df4050 100644 --- a/src/main/java/org/jitsi/jicofo/auth/AbstractAuthAuthority.java +++ b/src/main/java/org/jitsi/jicofo/auth/AbstractAuthAuthority.java @@ -351,10 +351,7 @@ protected void notifyUserAuthenticated(Jid userJid, public IQ processAuthentication( ConferenceIq query, ConferenceIq response) { - synchronized (syncRoot) - { - return processAuthLocked(query, response); - } + return processAuthLocked(query, response); } /**