Skip to content

Commit e06f02e

Browse files
committed
Avoiding NPE when removing comment
1 parent 1cc5fbc commit e06f02e

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

src/main/java/se/bjurr/violations/comments/bitbucketserver/lib/client/BitbucketServerInvoker.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private String doInvokeUrl(
8989
"Unsupported http method:\n" + url + "\n" + method + "\n" + postContent);
9090
}
9191
request.setURI(new URI(url));
92-
RequestConfig.Builder requestBuilder =
92+
final RequestConfig.Builder requestBuilder =
9393
RequestConfig.custom().setConnectionRequestTimeout(30000).setConnectTimeout(30000);
9494
request.setConfig(requestBuilder.build());
9595
request.addHeader("Authorization", authorizationValue);
@@ -98,16 +98,19 @@ private String doInvokeUrl(
9898
request.addHeader("Accept", "application/json");
9999

100100
if (request instanceof HttpPost && !isNullOrEmpty(postContent)) {
101-
StringEntity entity = new StringEntity(postContent, UTF_8);
101+
final StringEntity entity = new StringEntity(postContent, UTF_8);
102102
((HttpPost) request).setEntity(entity);
103103
}
104104

105-
HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
105+
final HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
106106
proxyConfig.addTo(httpClientBuilder);
107-
HttpClient httpClient = httpClientBuilder.build();
107+
final HttpClient httpClient = httpClientBuilder.build();
108108

109109
// Execute the request and get the response
110-
HttpResponse response = httpClient.execute(request);
110+
final HttpResponse response = httpClient.execute(request);
111+
if (response.getEntity() == null) {
112+
return null;
113+
}
111114
bufferedReader =
112115
new BufferedReader(new InputStreamReader(response.getEntity().getContent(), UTF_8));
113116
final StringBuilder stringBuilder = new StringBuilder();

0 commit comments

Comments
 (0)