From 37a6763a444257c8797e0aad301bc247dd559d87 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Mon, 5 Mar 2018 10:23:44 +0100
Subject: [PATCH] Fixed potential NPEs

---
 .../cloud/sleuth/instrument/web/SleuthHttpServerParser.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpServerParser.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpServerParser.java
index 2149614ef..9c943aea2 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpServerParser.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpServerParser.java
@@ -65,7 +65,11 @@ class SleuthHttpServerParser extends HttpServerParser {
 			error(null, error, customizer);
 			return;
 		}
-		int httpStatus = adapter.statusCode(res);
+		Integer httpStatus = adapter.statusCode(res);
+		if (httpStatus == null) {
+			error(httpStatus, error, customizer);
+			return;
+		}
 		if (httpStatus == HttpServletResponse.SC_OK && error != null) {
 			// Filter chain threw exception but the response status may not have been set
 			// yet, so we have to guess.