1 files changed, 11 insertions, 6 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/filter/core/ResponseFilterBridge.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/filter/core/ResponseFilterBridge.java
index 6d895ad0f93..8754dc150b7 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/filter/core/ResponseFilterBridge.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/client/filter/core/ResponseFilterBridge.java
@@ -5,6 +5,7 @@ import com.ning.http.client.filter.FilterContext;
 import com.yahoo.jdisc.Request;
 import com.yahoo.jdisc.http.client.filter.ResponseFilterContext;
 
+import java.net.URISyntaxException;
 import java.util.Collections;
 
 /**
@@ -13,12 +14,16 @@ import java.util.Collections;
 public class ResponseFilterBridge {
 
     public static ResponseFilterContext toResponseFilterContext(FilterContext<?> filterContext, Request request) {
-        return new ResponseFilterContext.Builder()
-                            .uri(filterContext.getRequest().getURI())
-                            .statusCode(filterContext.getResponseStatus().getStatusCode())
-                            .headers(filterContext.getResponseHeaders().getHeaders())
-                            .requestContext(request == null ? Collections.<String, Object>emptyMap() : request.context())
-                            .build();
+        try {
+            return new ResponseFilterContext.Builder()
+                    .uri(filterContext.getRequest().getUri().toJavaNetURI())
+                    .statusCode(filterContext.getResponseStatus().getStatusCode())
+                    .headers(filterContext.getResponseHeaders().getHeaders())
+                    .requestContext(request == null ? Collections.<String, Object>emptyMap() : request.context())
+                    .build();
+        } catch (URISyntaxException e) {
+            throw new RuntimeException("Bad URI", e);
+        }
     }
 
 }