From 4208fa31c712fa15e015cb93b2c1b528943f3ece Mon Sep 17 00:00:00 2001
From: Robert Butts <robert.o.butts@gmail.com>
Date: Wed, 6 Jul 2016 14:16:00 -0600
Subject: [PATCH] Fix TR to continue if a DS regex is invalid.

Fixes #1587
---
 .../traffic_router/core/dns/ZoneManager.java  | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManager.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManager.java
index 747ec3778..92bc64208 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManager.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManager.java
@@ -619,25 +619,23 @@ private static final Map<String, List<Record>> populateZoneMap(final Map<String,
 					continue;
 				}
 
-				final Name name = newName(fqdn);
-				final JSONObject ttl = ds.getTtls();
-
 				try {
-					zholder.add(new ARecord(name,
-						DClass.IN,
-						ZoneUtils.getLong(ttl, "A", 60),
-						c.getIp4()));
-				} catch (IllegalArgumentException e) {
-					LOGGER.warn(e + " : " + c.getIp4());
-				}
+					final Name name = newName(fqdn);
+					final JSONObject ttl = ds.getTtls();
 
-				final InetAddress ip6 = c.getIp6();
+					try {
+						zholder.add(new ARecord(name, DClass.IN, ZoneUtils.getLong(ttl, "A", 60), c.getIp4()));
+					} catch (IllegalArgumentException e) {
+						LOGGER.warn(e + " : " + c.getIp4());
+					}
+
+					final InetAddress ip6 = c.getIp6();
 
-				if (ip6 != null && ds != null && ds.isIp6RoutingEnabled()) {
-					zholder.add(new AAAARecord(name,
-							DClass.IN,
-							ZoneUtils.getLong(ttl, AAAA, 60),
-							ip6));
+					if (ip6 != null && ds != null && ds.isIp6RoutingEnabled()) {
+						zholder.add(new AAAARecord(name, DClass.IN, ZoneUtils.getLong(ttl, AAAA, 60), ip6));
+					}
+				} catch (org.xbill.DNS.TextParseException e) {
+					LOGGER.error("Caught fatal exception while generating zone data for " + fqdn  + "!", e);
 				}
 			}
 		}