Fixes a recursion problem in Candidate.equals which happen by comparing two RelayedCandidates with same address/port.
This commit is contained in:
parent
14e1a3f8a2
commit
47c73815a9
@ -285,7 +285,8 @@ public abstract class Candidate
|
|||||||
}
|
}
|
||||||
|
|
||||||
//compare other properties
|
//compare other properties
|
||||||
if(getBase().equals(targetCandidate.getBase())
|
if(((getBase() == this && targetCandidate.getBase() == targetCandidate)
|
||||||
|
|| getBase().equals(targetCandidate.getBase()))
|
||||||
&& getPriority() == targetCandidate.getPriority()
|
&& getPriority() == targetCandidate.getPriority()
|
||||||
&& getType() == targetCandidate.getType()
|
&& getType() == targetCandidate.getType()
|
||||||
&& getFoundation().equals(targetCandidate.getFoundation()))
|
&& getFoundation().equals(targetCandidate.getFoundation()))
|
||||||
|
|||||||
@ -297,6 +297,10 @@ class ConnectivityCheckClient
|
|||||||
= checkedPair.getParentComponent().getParentStream();
|
= checkedPair.getParentComponent().getParentStream();
|
||||||
final CheckList checkList = stream.getCheckList();
|
final CheckList checkList = stream.getCheckList();
|
||||||
|
|
||||||
|
if(stream.getParentAgent().getState().equals(
|
||||||
|
IceProcessingState.COMPLETED))
|
||||||
|
return;
|
||||||
|
|
||||||
//If all of the pairs in the check list are now either in the Failed or
|
//If all of the pairs in the check list are now either in the Failed or
|
||||||
//Succeeded state:
|
//Succeeded state:
|
||||||
boolean allPairsDone = true;
|
boolean allPairsDone = true;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user