Skip to content

PGI Jicofo Patches #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GauravGupta0 wants to merge 2 commits into
base: fd_786
Choose a base branch
from
Open

PGI Jicofo Patches #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3960baa
Jicofo Patches
gaurav-gu Sep 30, 2021
faa6c94
Added true to send for source-remove
Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/main/java/org/jitsi/impl/reservation/rest/ApiHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down Expand Up @@ -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 <tt>Conference</tt> objects.
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -190,7 +194,7 @@ public ApiResult getConference(Number conferenceId)
return new ApiResult(statusCode, error);
}
}
finally
finally
{
if (response != null && response.getEntity() != null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/org/jitsi/jicofo/auth/AbstractAuthAuthority.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down