PublicSuffixMatcher.java (httpcomponents-client-4.5.6-src) | : | PublicSuffixMatcher.java (httpcomponents-client-4.5.7-src) | ||
---|---|---|---|---|
skipping to change at line 106 | skipping to change at line 106 | |||
} | } | |||
} | } | |||
} | } | |||
} | } | |||
private static boolean hasEntry(final Map<String, DomainType> map, final Str ing rule, final DomainType expectedType) { | private static boolean hasEntry(final Map<String, DomainType> map, final Str ing rule, final DomainType expectedType) { | |||
if (map == null) { | if (map == null) { | |||
return false; | return false; | |||
} | } | |||
final DomainType domainType = map.get(rule); | final DomainType domainType = map.get(rule); | |||
if (domainType == null) { | return domainType == null ? false : expectedType == null || domainType.e | |||
return false; | quals(expectedType); | |||
} else { | ||||
return expectedType == null || domainType.equals(expectedType); | ||||
} | ||||
} | } | |||
private boolean hasRule(final String rule, final DomainType expectedType) { | private boolean hasRule(final String rule, final DomainType expectedType) { | |||
return hasEntry(this.rules, rule, expectedType); | return hasEntry(this.rules, rule, expectedType); | |||
} | } | |||
private boolean hasException(final String exception, final DomainType expect edType) { | private boolean hasException(final String exception, final DomainType expect edType) { | |||
return hasEntry(this.exceptions, exception, expectedType); | return hasEntry(this.exceptions, exception, expectedType); | |||
} | } | |||
End of changes. 1 change blocks. | ||||
5 lines changed or deleted | 2 lines changed or added |