Fixes a recursion problem in Candidate.equals which happen by comparing two RelayedCandidates with same address/port.

This commit is contained in:
seb 2011-09-01 14:37:09 +00:00
parent 14e1a3f8a2
commit 47c73815a9
2 changed files with 6 additions and 1 deletions

View File

@ -285,7 +285,8 @@ public abstract class Candidate
}
//compare other properties
if(getBase().equals(targetCandidate.getBase())
if(((getBase() == this && targetCandidate.getBase() == targetCandidate)
|| getBase().equals(targetCandidate.getBase()))
&& getPriority() == targetCandidate.getPriority()
&& getType() == targetCandidate.getType()
&& getFoundation().equals(targetCandidate.getFoundation()))

View File

@ -297,6 +297,10 @@ class ConnectivityCheckClient
= checkedPair.getParentComponent().getParentStream();
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
//Succeeded state:
boolean allPairsDone = true;