From 970b2ca96e0173b75848c0fad34df1c2aa55f0ea Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Wed, 11 May 2016 10:56:59 +0000 Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1) 126386 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 120471 jvonka: FileFolder API - NodeApiTest - follow-on to fix NPE in debug logging RA-641 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/rest/api/tests/client/HttpResponse.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/client/HttpResponse.java b/source/test-java/org/alfresco/rest/api/tests/client/HttpResponse.java index 7e7581d21b..65d065eca3 100644 --- a/source/test-java/org/alfresco/rest/api/tests/client/HttpResponse.java +++ b/source/test-java/org/alfresco/rest/api/tests/client/HttpResponse.java @@ -27,6 +27,7 @@ package org.alfresco.rest.api.tests.client; import java.util.Map; +import org.apache.commons.httpclient.Header; import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.HttpMethodBase; import org.apache.commons.httpclient.URIException; @@ -145,7 +146,12 @@ public class HttpResponse sb.append("user ").append(user).append("\n"); sb.append("returned ").append(method.getStatusCode()).append(" and took ").append(time).append("ms").append("\n"); - String contentType = method.getResponseHeader("Content-Type").getValue(); + String contentType = null; + Header hdr = method.getResponseHeader("Content-Type"); + if (hdr != null) + { + contentType = hdr.getValue(); + } sb.append("Response content type: ").append(contentType).append("\n"); if (contentType != null)