METRICS-3129: Fix NPE in HttpClient 3 and 4 plugin

spring-attic · Dec 3, 2012 · a31d8a5 · a31d8a5
1 parent 7f912aa
commit a31d8a5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/...va/com/springsource/insight/plugin/apache/http/hc3/HttpClientExecutionCollectionAspect.aj b/...va/com/springsource/insight/plugin/apache/http/hc3/HttpClientExecutionCollectionAspect.aj
@@ -184,7 +184,12 @@ public aspect HttpClientExecutionCollectionAspect extends OperationCollectionAsp
         op.put(HttpStatusTraceErrorAnalyzer.STATUS_CODE_ATTR, statusCode);
 
         if (collectExtra) {
-            op.putAnyNonEmpty(HttpStatusTraceErrorAnalyzer.REASON_PHRASE_ATTR, method.getStatusText());
+        	StatusLine statusLine = method.getStatusLine();
+
+        	if (statusLine != null) {
+        		op.putAnyNonEmpty(HttpStatusTraceErrorAnalyzer.REASON_PHRASE_ATTR, statusLine.getReasonPhrase());
+        	}
+
             fillInMethodHeaders(op.createList("headers"), method, false);
         }
 

diff --git a/...ns/httpclient3/src/main/resources/com/springsource/insight/plugin/apache/http/hc3/hc3.ftl b/...ns/httpclient3/src/main/resources/com/springsource/insight/plugin/apache/http/hc3/hc3.ftl
@@ -6,7 +6,7 @@
 
 <@insight.title>Apache HC3 Summary</@insight.title>
 <code class="raw http">${request.method?html} ${request.uri?html} ${request.protocol?html}</code>
-<code class="raw http">${request.protocol?html} ${response.statusCode?html} ${response.reasonPhrase?html}</code>
+<code class="raw http"><#if request.protocol??>${request.protocol?html}</#if> <#if request.statusCode??>${response.statusCode?html}</#if> <#if request.reasonPhrase??>${response.reasonPhrase?html}</#if></code>
 
 <@insight.group label="Request Headers" if=request.headers?has_content collection=request.headers ; h>
     <@insight.entry name=h.name value=h.value required="true" />

diff --git a/...va/com/springsource/insight/plugin/apache/http/hc4/HttpClientExecutionCollectionAspect.aj b/...va/com/springsource/insight/plugin/apache/http/hc4/HttpClientExecutionCollectionAspect.aj
@@ -241,11 +241,15 @@ public aspect HttpClientExecutionCollectionAspect extends OperationCollectionAsp
 
     OperationMap fillInResponseDetails(OperationMap op, HttpResponse response, boolean collectExtra) {
         StatusLine statusLine = response.getStatusLine();
-        op.put("statusCode", statusLine.getStatusCode());
-
-        if (collectExtra) {
-            op.putAnyNonEmpty("reasonPhrase", statusLine.getReasonPhrase());
-            fillInMessageHeaders(op.createList("headers"), response);
+
+        if (statusLine != null) {
+			op.put("statusCode", statusLine.getStatusCode());
+		}
+		if (collectExtra) {
+            if (statusLine != null) {
+				op.putAnyNonEmpty("reasonPhrase", statusLine.getReasonPhrase());
+			}
+			fillInMessageHeaders(op.createList("headers"), response);
         }
 
         return op;

diff --git a/...ns/httpclient4/src/main/resources/com/springsource/insight/plugin/apache/http/hc4/hc4.ftl b/...ns/httpclient4/src/main/resources/com/springsource/insight/plugin/apache/http/hc4/hc4.ftl
@@ -6,7 +6,7 @@
 
 <@insight.title>Apache HC4 Summary</@insight.title>
 <code class="raw http">${request.method?html} ${request.uri?html} ${request.protocol?html}</code>
-<code class="raw http">${request.protocol?html} ${response.statusCode?html} ${response.reasonPhrase?html}</code>
+<code class="raw http"><#if request.protocol??>${request.protocol?html}</#if> <#if request.statusCode??>${response.statusCode?html}</#if> <#if request.reasonPhrase??>${response.reasonPhrase?html}</#if></code>
 
 <@insight.group label="Request Headers" if=request.headers?has_content collection=request.headers ; h>
     <@insight.entry name=h.name value=h.value required="true" />