[incubator-trafficcontrol] 01/05: initial commit

[elsloo]

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 6110f585386c0d677fddd31a71c7c378781e94b2
Author: Jesse Rivas <jesse_ri...@comcast.com>
AuthorDate: Fri Jan 19 11:27:56 2018 -0700

    initial commit
---
 .../cdn/traffic_control/traffic_router/core/http/RouterFilter.java    | 4 ++--
 .../cdn/traffic_control/traffic_router/core/router/TrafficRouter.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java
 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java
index efdbad9..6702741 100644
--- 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java
+++ 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java
@@ -123,8 +123,8 @@ public class RouterFilter extends OncePerRequestFilter {
        }
 
        private void setMultiResponse(final HTTPRouteResult routeResult, final 
HttpServletRequest httpServletRequest, final HttpServletResponse response, 
final HTTPAccessRecord.Builder httpAccessRecordBuilder) throws IOException {
-               for (final DeliveryService deliveryService : 
routeResult.getDeliveryServices()) {
-                       final Map<String, String> responseHeaders = 
deliveryService.getResponseHeaders();
+               if (routeResult.getDeliveryService() != null) {
+                       final Map<String, String> responseHeaders = 
routeResult.getDeliveryService().getResponseHeaders();
 
                        for (final String key : responseHeaders.keySet()) {
                                // if two DSs append the same header, the last 
one wins; no way around it unless we enforce unique response headers between 
subordinate DSs
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 b63e075..acaa9d4 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
@@ -487,6 +487,7 @@ public class TrafficRouter {
                        return null;
                }
 
+               routeResult.setDeliveryService(entryDeliveryService);
                for (final DeliveryService deliveryService : deliveryServices) {
                        if (deliveryService.isRegionalGeoEnabled()) {
                                LOGGER.error("Regional Geo Blocking is not 
supported with multi-route delivery services.. skipping " + 
entryDeliveryService.getId() + "/" + deliveryService.getId());
@@ -495,7 +496,6 @@ public class TrafficRouter {
 
                        if (deliveryService.isAvailable()) {
                                final List<Cache> caches = 
selectCaches(request, deliveryService, track);
-                               routeResult.addDeliveryService(deliveryService);
 
                                if (caches != null && !caches.isEmpty()) {
                                        final Cache cache = 
consistentHasher.selectHashable(caches, deliveryService.getDispersion(), 
request.getPath());

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