[trafficcontrol] branch master updated: fixed TR NPE where ipAddresses gets set to null (#4834)

[mitchell852]

This is an automated email from the ASF dual-hosted git repository.

mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new 470ce9c  fixed TR NPE where ipAddresses gets set to null (#4834)
470ce9c is described below

commit 470ce9c0df3f1f4eee6fb7f99fba67aa9c3771ef
Author: mattjackson220 <33879985+mattjackson...@users.noreply.github.com>
AuthorDate: Mon Jul 6 13:21:36 2020 -0600

    fixed TR NPE where ipAddresses gets set to null (#4834)
    
    * fixed TR NPE where ipAddresses gets set to null
    
    * removed unused resolver
    
    Co-authored-by: mattjackson220 <matthew_jack...@comcast.com>
---
 .../cdn/traffic_control/traffic_router/core/edge/Node.java       | 9 +++------
 .../traffic_router/core/router/TrafficRouter.java                | 2 +-
 .../traffic_control/traffic_router/core/util/DataExporter.java   | 7 +++----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Node.java
 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Node.java
index b40c1a9..ffc0b8d 100644
--- 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Node.java
+++ 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Node.java
@@ -83,15 +83,12 @@ public class Node extends DefaultHashable {
                return id;
        }
 
-       public List<InetRecord> getIpAddresses(final JsonNode ttls, final 
Resolver resolver) {
-               return getIpAddresses(ttls, resolver, true);
+       public List<InetRecord> getIpAddresses(final JsonNode ttls) {
+               return getIpAddresses(ttls, true);
        }
 
        @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity"})
-       public List<InetRecord> getIpAddresses(final JsonNode ttls, final 
Resolver resolver, final boolean ip6RoutingEnabled) {
-               if(ipAddresses == null || ipAddresses.isEmpty()) {
-                       ipAddresses = resolver.resolve(this.getFqdn()+".");
-               }
+       public List<InetRecord> getIpAddresses(final JsonNode ttls, final 
boolean ip6RoutingEnabled) {
                if(ipAddresses == null) { return null; }
                final List<InetRecord> ret = new ArrayList<InetRecord>();
                for (final InetRecord ir : ipAddresses) {
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 34adf34..df6d14e 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
@@ -708,7 +708,7 @@ public class TrafficRouter {
                }
 
                for (final Cache cache : selectedCaches) {
-                       addresses.addAll(cache.getIpAddresses(ds.getTtls(), 
zoneManager, ds.isIp6RoutingEnabled()));
+                       addresses.addAll(cache.getIpAddresses(ds.getTtls(), 
ds.isIp6RoutingEnabled()));
                }
 
                return addresses;
diff --git 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DataExporter.java
 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DataExporter.java
index ee19629..0b2bb3a 100644
--- 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DataExporter.java
+++ 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DataExporter.java
@@ -35,7 +35,6 @@ import 
com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation;
 import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister;
 import com.comcast.cdn.traffic_control.traffic_router.core.edge.InetRecord;
 import com.comcast.cdn.traffic_control.traffic_router.core.edge.Location;
-import com.comcast.cdn.traffic_control.traffic_router.core.edge.Resolver;
 import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation;
 import 
com.comcast.cdn.traffic_control.traffic_router.geolocation.GeolocationException;
 import com.comcast.cdn.traffic_control.traffic_router.core.loc.NetworkNode;
@@ -177,7 +176,7 @@ public class DataExporter {
        public List<CacheModel> getCaches(final String locationId) {
                final TrafficRouter trafficRouter = 
trafficRouterManager.getTrafficRouter();
                final CacheLocation location = 
trafficRouter.getCacheRegister().getCacheLocation(locationId);
-               return getCaches(location, trafficRouter.getZoneManager());
+               return getCaches(location);
        }
 
        public Map<String, Object> getCaches() {
@@ -191,13 +190,13 @@ public class DataExporter {
                return models;
        }
 
-       private List<CacheModel> getCaches(final CacheLocation location, final 
Resolver resolver) {
+       private List<CacheModel> getCaches(final CacheLocation location) {
                final List<CacheModel> models = new ArrayList<CacheModel>();
 
                for (final Cache cache : location.getCaches()) {
                        final CacheModel model = new CacheModel();
                        final List<String> ipAddresses = new 
ArrayList<String>();
-                       final List<InetRecord> ips = cache.getIpAddresses(null, 
resolver);
+                       final List<InetRecord> ips = cache.getIpAddresses(null);
 
                        if (ips != null) {
                                for (final InetRecord address : ips) {