From 86835eec73eb13a3eeeb9df8185f347ccecde8a4 Mon Sep 17 00:00:00 2001 From: Athou Date: Thu, 12 Oct 2017 10:21:11 +0200 Subject: [PATCH] request may not be a HttpUriRequest when using a proxy (#850) --- src/main/java/com/commafeed/backend/HttpGetter.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/commafeed/backend/HttpGetter.java b/src/main/java/com/commafeed/backend/HttpGetter.java index 31d52a560..350c1f48c 100644 --- a/src/main/java/com/commafeed/backend/HttpGetter.java +++ b/src/main/java/com/commafeed/backend/HttpGetter.java @@ -151,9 +151,13 @@ public HttpResult getBinary(String url, String lastModified, String eTag, int ti contentType = entity.getContentType().getValue(); } } - HttpUriRequest req = (HttpUriRequest) context.getRequest(); - HttpHost host = context.getTargetHost(); - String urlAfterRedirect = req.getURI().isAbsolute() ? req.getURI().toString() : host.toURI() + req.getURI(); + + String urlAfterRedirect = url; + if (context.getRequest() instanceof HttpUriRequest) { + HttpUriRequest req = (HttpUriRequest) context.getRequest(); + HttpHost host = context.getTargetHost(); + urlAfterRedirect = req.getURI().isAbsolute() ? req.getURI().toString() : host.toURI() + req.getURI(); + } long duration = System.currentTimeMillis() - start; result = new HttpResult(content, contentType, lastModifiedHeaderValue, eTagHeaderValue, duration, urlAfterRedirect);