You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ra...@apache.org on 2020/11/02 20:34:38 UTC
[trafficcontrol] branch 4.1.x updated: fixed TR NPE where
ipAddresses gets set to null (#4834) (#5233)
This is an automated email from the ASF dual-hosted git repository.
rawlin pushed a commit to branch 4.1.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/4.1.x by this push:
new 83ec3dd fixed TR NPE where ipAddresses gets set to null (#4834) (#5233)
83ec3dd is described below
commit 83ec3ddff731eb48adc413a70a735a78faa9a656
Author: Rawlin Peters <ra...@apache.org>
AuthorDate: Mon Nov 2 13:34:30 2020 -0700
fixed TR NPE where ipAddresses gets set to null (#4834) (#5233)
* fixed TR NPE where ipAddresses gets set to null
* removed unused resolver
Co-authored-by: mattjackson220 <ma...@comcast.com>
(cherry picked from commit 470ce9c0df3f1f4eee6fb7f99fba67aa9c3771ef)
Co-authored-by: mattjackson220 <33...@users.noreply.github.com>
---
.../cdn/traffic_control/traffic_router/core/cache/Cache.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/cache/Cache.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Cache.java
index 48da61c..a0356e3 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Cache.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Cache.java
@@ -98,15 +98,12 @@ public class Cache implements Comparable<Cache>, Hashable<Cache> {
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 c668190..cbe9700 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
@@ -470,7 +470,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 fffc8fb..fdfbc73 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
@@ -33,7 +33,6 @@ import com.comcast.cdn.traffic_control.traffic_router.core.cache.Cache;
import com.comcast.cdn.traffic_control.traffic_router.core.cache.CacheLocation;
import com.comcast.cdn.traffic_control.traffic_router.core.cache.CacheRegister;
import com.comcast.cdn.traffic_control.traffic_router.core.cache.InetRecord;
-import com.comcast.cdn.traffic_control.traffic_router.core.cache.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;
@@ -175,7 +174,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() {
@@ -189,13 +188,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) {