Fixes warnings. Applies formatting.
This commit is contained in:
parent
ec427382e9
commit
3dc113edd8
@ -825,14 +825,11 @@ public class Agent
|
|||||||
public String generateRemoteUserName(String media)
|
public String generateRemoteUserName(String media)
|
||||||
{
|
{
|
||||||
IceMediaStream stream = getStream(media);
|
IceMediaStream stream = getStream(media);
|
||||||
String ret = null;
|
|
||||||
|
|
||||||
if(stream == null)
|
return
|
||||||
{
|
(stream == null)
|
||||||
return null;
|
? null
|
||||||
}
|
: (getLocalUfrag() + ":" + stream.getRemoteUfrag());
|
||||||
|
|
||||||
return getLocalUfrag() + ":" + stream.getRemoteUfrag();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -880,11 +877,15 @@ public class Agent
|
|||||||
Candidate<?> candidate1,
|
Candidate<?> candidate1,
|
||||||
Candidate<?> candidate2)
|
Candidate<?> candidate2)
|
||||||
{
|
{
|
||||||
String ret = null;
|
/*
|
||||||
String ufrag1 = candidate1.getUfrag();
|
* FIXME Are the invocations of Candidate.getUfrag() necessary for their
|
||||||
String ufrag2 = candidate2.getUfrag();
|
* side effects alone? For example, to make sure that neither of the
|
||||||
|
* Candidates is null?
|
||||||
|
*/
|
||||||
|
candidate1.getUfrag();
|
||||||
|
candidate2.getUfrag();
|
||||||
|
|
||||||
return ret;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -303,8 +303,6 @@ public class Component
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
if(remoteCandidate.getTransportAddress().getPort() == 443)
|
if(remoteCandidate.getTransportAddress().getPort() == 443)
|
||||||
{
|
{
|
||||||
//SSL/TCP handshake
|
//SSL/TCP handshake
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user