diff --git a/src/org/ice4j/ice/ConnectivityCheckServer.java b/src/org/ice4j/ice/ConnectivityCheckServer.java index 481837a..497eb05 100644 --- a/src/org/ice4j/ice/ConnectivityCheckServer.java +++ b/src/org/ice4j/ice/ConnectivityCheckServer.java @@ -32,6 +32,23 @@ class ConnectivityCheckServer private static final Logger logger = Logger.getLogger(ConnectivityCheckServer.class.getName()); + /** + * Compares a and b as unsigned long values. Serves the + * same purpose as the Long.compareUnsigned method available in + * Java 1.8. + * @return -1 if a is less than b, 0 if + * they are equal and 1 if a is bigger. + */ + private static int compareUnsignedLong(long a, long b) + { + if (a == b) + return 0; + else if ((a + Long.MIN_VALUE) < (b + Long.MIN_VALUE)) + return -1; + else + return 1; + } + /** * The agent that created us. */ @@ -257,7 +274,7 @@ class ConnectivityCheckServer // contents of the ICE-CONTROLLING attribute, the agent generates // a Binding error response and includes an ERROR-CODE attribute // with a value of 487 (Role Conflict) but retains its role. - if(Long.compareUnsigned(ourTieBreaker, theirTieBreaker) >= 0) + if(compareUnsignedLong(ourTieBreaker, theirTieBreaker) >= 0) { Response response = MessageFactory.createBindingErrorResponse( ErrorCodeAttribute.ROLE_CONFLICT); @@ -284,7 +301,7 @@ class ConnectivityCheckServer else { logger.finer( - "Swithing to controlled because theirTieBreaker=" + "Switching to controlled because theirTieBreaker=" + theirTieBreaker + " and ourTieBreaker=" + ourTieBreaker); parentAgent.setControlling(false); @@ -304,7 +321,7 @@ class ConnectivityCheckServer //If the agent's tie-breaker is larger than or equal to the //contents of the ICE-CONTROLLED attribute, the agent switches to //the controlling role. - if(Long.compareUnsigned(ourTieBreaker, theirTieBreaker) >= 0) + if(compareUnsignedLong(ourTieBreaker, theirTieBreaker) >= 0) { logger.finer( "Switching to controlling because theirTieBreaker="