bugfix: NullPointerException on HttpServletResponseMDC.isAsset

jhannes · Apr 15, 2024 · ae1f05b · ae1f05b
1 parent fcfeed5
commit ae1f05b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/logevents/src/main/java/org/logevents/optional/jakarta/HttpServletResponseMDC.java b/logevents/src/main/java/org/logevents/optional/jakarta/HttpServletResponseMDC.java
@@ -113,7 +113,7 @@ private static Marker getMarkerFromContentType(HttpServletResponse response) {
 
     public static boolean isAsset(HttpServletResponse response) {
         String contentType = response.getContentType();
-        return (contentType.startsWith("image/") || contentType.startsWith("font/") || contentType.startsWith("text/html") || contentType.startsWith("text/css") || contentType.startsWith("text/javascript"));
+        return contentType != null && (contentType.startsWith("image/") || contentType.startsWith("font/") || contentType.startsWith("text/html") || contentType.startsWith("text/css") || contentType.startsWith("text/javascript"));
     }
 
     protected static boolean isRedirect(int status) {

diff --git a/logevents/src/main/java/org/logevents/optional/servlets/HttpServletResponseMDC.java b/logevents/src/main/java/org/logevents/optional/servlets/HttpServletResponseMDC.java
@@ -112,7 +112,7 @@ private static Marker getMarkerFromContentType(HttpServletResponse response) {
 
     public static boolean isAsset(HttpServletResponse response) {
         String contentType = response.getContentType();
-        return (contentType.startsWith("image/") || contentType.startsWith("font/") || contentType.startsWith("text/html") || contentType.startsWith("text/css") || contentType.startsWith("text/javascript"));
+        return contentType != null && (contentType.startsWith("image/") || contentType.startsWith("font/") || contentType.startsWith("text/html") || contentType.startsWith("text/css") || contentType.startsWith("text/javascript"));
     }
 
     protected static boolean isRedirect(int status) {

diff --git a/logevents/src/test/java/org/logevents/optional/jakarta/HttpServletResponseMDCTest.java b/logevents/src/test/java/org/logevents/optional/jakarta/HttpServletResponseMDCTest.java
@@ -15,7 +15,9 @@
 import java.util.HashSet;
 import java.util.Map;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class HttpServletResponseMDCTest {
@@ -73,6 +75,17 @@ public void shouldClassifyMarkerBasedOnContentType() {
         assertEquals(HttpServletResponseMDC.JSON, HttpServletResponseMDC.getMarker(mockResponse));
     }
 
+    @Test
+    public void shouldIdentifyAssetContent() {
+        javax.servlet.http.HttpServletResponse mockResponse = Mockito.mock(javax.servlet.http.HttpServletResponse.class);
+        Mockito.when(mockResponse.getContentType()).thenReturn("image/png");
+        assertTrue(org.logevents.optional.servlets.HttpServletResponseMDC.isAsset(mockResponse));
+        Mockito.when(mockResponse.getContentType()).thenReturn("application/json");
+        assertFalse(org.logevents.optional.servlets.HttpServletResponseMDC.isAsset(mockResponse));
+        Mockito.when(mockResponse.getContentType()).thenReturn(null);
+        assertFalse(org.logevents.optional.servlets.HttpServletResponseMDC.isAsset(mockResponse));
+    }
+
     static HttpServletResponse createMockResponse() {
         HttpServletResponse mockResponse = Mockito.mock(HttpServletResponse.class);
         Mockito.when(mockResponse.getStatus()).thenReturn(401);

diff --git a/logevents/src/test/java/org/logevents/optional/servlets/HttpServletResponseMDCTest.java b/logevents/src/test/java/org/logevents/optional/servlets/HttpServletResponseMDCTest.java
@@ -15,6 +15,7 @@
 import java.util.HashSet;
 import java.util.Map;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -74,6 +75,17 @@ public void shouldClassifyMarkerBasedOnContentType() {
         assertEquals(HttpServletResponseMDC.JSON, HttpServletResponseMDC.getMarker(mockResponse));
     }
 
+    @Test
+    public void shouldIdentifyAssetContent() {
+        HttpServletResponse mockResponse = Mockito.mock(HttpServletResponse.class);
+        Mockito.when(mockResponse.getContentType()).thenReturn("image/png");
+        assertTrue(HttpServletResponseMDC.isAsset(mockResponse));
+        Mockito.when(mockResponse.getContentType()).thenReturn("application/json");
+        assertFalse(HttpServletResponseMDC.isAsset(mockResponse));
+        Mockito.when(mockResponse.getContentType()).thenReturn(null);
+        assertFalse(HttpServletResponseMDC.isAsset(mockResponse));
+    }
+
 
     static HttpServletResponse createMockResponse() {
         HttpServletResponse mockResponse = Mockito.mock(HttpServletResponse.class);