Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

[4.1.x backport] fixed TR NPE where ipAddresses gets set to null (#4834) #5233

Merged
rawlinp merged 1 commit into from
Nov 2, 2020
Merged

[4.1.x backport] fixed TR NPE where ipAddresses gets set to null (#4834) #5233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions ...r/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/cache/Cache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,12 @@ public String getId() {
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) {
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ public List<InetRecord> inetRecordsFromCaches(final DeliveryService ds, final Li
}

for (final Cache cache : selectedCaches) {
addresses.addAll(cache.getIpAddresses(ds.getTtls(), zoneManager, ds.isIp6RoutingEnabled()));
addresses.addAll(cache.getIpAddresses(ds.getTtls(), ds.isIp6RoutingEnabled()));
}

return addresses;
Expand Down
7 changes: 3 additions & 4 deletions .../src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DataExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
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;
Expand Down Expand Up @@ -175,7 +174,7 @@ public List<String> getLocations() {
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() {
Expand All @@ -189,13 +188,13 @@ public Map<String, Object> getCaches() {
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) {
Expand Down