Read response body, not request body

1 files changed, 4 insertions, 2 deletions

diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/HttpFeedClient.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/HttpFeedClient.java
index 8ee48548b31..2427b71a104 100644
--- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/HttpFeedClient.java
+++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/HttpFeedClient.java
@@ -134,10 +134,12 @@ class HttpFeedClient implements FeedClient {
             HttpResponse response = future.get(20, TimeUnit.SECONDS);
             if (response.code() != 200) {
                 String message;
-                switch (response.contentType()) { case "application/json": message = parseMessage(request.body()); break;
-                    case "text/plain": message = new String(request.body(), UTF_8); break;
+                if (response.body() != null) switch (response.contentType()) {
+                    case "application/json": message = parseMessage(response.body()); break;
+                    case "text/plain": message = new String(response.body(), UTF_8); break;
                     default: message = response.toString(); break;
                 }
+                else message = response.toString();
                 throw new FeedException("server responded non-OK to handshake: " + message);
             }
         }