This is an automated email from the ASF dual-hosted git repository. elsloo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit cda870b64b3cdb4c162734667d0182fd32fcba7f Author: Jesse Rivas <jesse_ri...@comcast.com> AuthorDate: Tue Feb 13 14:02:34 2018 -0700 add 0 check for initial dispersion --- .../cdn/traffic_control/traffic_router/core/ds/Dispersion.java | 5 ++++- .../traffic_control/traffic_router/core/hash/ConsistentHasher.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Dispersion.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Dispersion.java index 1f978d3..ee41ff3 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Dispersion.java +++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Dispersion.java @@ -37,7 +37,10 @@ public class Dispersion { final JsonNode jo = dsJo.get("dispersion"); if (jo != null) { - this.setLimit(JsonUtils.optInt(jo, "limit", DEFAULT_LIMIT)); + final int limit = JsonUtils.optInt(jo, "limit", DEFAULT_LIMIT); + if (limit != 0) { + this.setLimit(limit); + } this.setShuffled(JsonUtils.optBoolean(jo, "shuffled", DEFAULT_SHUFFLED)); } else if (dsJo.has("maxDnsIpsForLocation")) { // if no specific dispersion, use maxDnsIpsForLocation (should be DNS DSs only) diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/ConsistentHasher.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/ConsistentHasher.java index 099ac7a..e3642ee 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/ConsistentHasher.java +++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/ConsistentHasher.java @@ -28,7 +28,7 @@ public class ConsistentHasher { final private MD5HashFunction hashFunction = new MD5HashFunction(); public <T extends Hashable> T selectHashable(final List<T> hashables, final Dispersion dispersion, final String s) { - List<T> selectedHashables = selectHashables(hashables, dispersion, s); + final List<T> selectedHashables = selectHashables(hashables, dispersion, s); return !selectedHashables.isEmpty() ? selectedHashables.get(0) : null; } -- To stop receiving notification emails like this one, please contact els...@apache.org.