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 13de8373662f78b77ffbebaabf9a7533cf78ae56
Author: Jesse Rivas <jesse_ri...@comcast.com>
AuthorDate: Tue Feb 13 11:29:56 2018 -0700

    renamed isDefault to defaultLocation
---
 .../traffic_router/core/loc/MaxmindGeolocationService.java     |  2 +-
 .../traffic_router/core/router/TrafficRouter.java              |  2 +-
 .../traffic_router/geolocation/Geolocation.java                | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java
 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java
index b7e4567..1acc63e 100644
--- 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java
+++ 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java
@@ -151,7 +151,7 @@ public class MaxmindGeolocationService implements 
GeolocationService {
                }
 
                if (geolocation.getCity() == null && 
geolocation.getPostalCode() == null && response.getSubdivisions().isEmpty()) {
-                       geolocation.setIsDefault(true);
+                       geolocation.setDefaultLocation(true);
                }
 
                return geolocation;
diff --git 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
index 17d5605..336bf4d 100644
--- 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
+++ 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
@@ -325,7 +325,7 @@ public class TrafficRouter {
                        }
                }
 
-               if (clientLocation.isDefault() && 
defaultGeolocations.containsKey(clientLocation.getCountryCode())) {
+               if (clientLocation.isDefaultLocation() && 
defaultGeolocations.containsKey(clientLocation.getCountryCode())) {
                        clientLocation = 
defaultGeolocations.get(clientLocation.getCountryCode());
                }
 
diff --git 
a/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/Geolocation.java
 
b/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/Geolocation.java
index 3b2f6f4..e28ba57 100644
--- 
a/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/Geolocation.java
+++ 
b/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/Geolocation.java
@@ -31,7 +31,7 @@ public class Geolocation {
        private String city;
        private String countryCode;
        private String countryName;
-       private boolean isDefault = false;
+       private boolean defaultLocation = false;
 
        /**
         * Creates an immutable {@link Geolocation}.
@@ -146,12 +146,12 @@ public class Geolocation {
                this.countryName = countryName;
        }
 
-       public boolean isDefault() {
-               return isDefault;
+       public boolean isDefaultLocation() {
+               return defaultLocation;
        }
 
-       public void setIsDefault(boolean isDefault) {
-               this.isDefault = isDefault;
+       public void setDefaultLocation(boolean defaultLocation) {
+               this.defaultLocation = defaultLocation;
        }
 
        @Override

-- 
To stop receiving notification emails like this one, please contact
els...@apache.org.

Reply via email to