handle exception case

wcm-io · Jan 19, 2024 · 3f9e092 · 3f9e092
1 parent c07b8b9
commit 3f9e092
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/main/java/io/wcm/handler/commons/servlets/impl/HtxPageExtensionMapper.java b/src/main/java/io/wcm/handler/commons/servlets/impl/HtxPageExtensionMapper.java
@@ -111,9 +111,7 @@ protected void doGet(@NotNull SlingHttpServletRequest request, @NotNull SlingHtt
       requestDispatcher.include(request, response);
     }
     else {
-      String referrer = request.getHeader("Referrer");
-      log.error("Unable to dispatch proxy request for {} referrer={}", request.getRequestURI(), referrer);
-      throw new ServletException("No Content");
+      throw new ServletException("No Request Dispatcher.");
     }
 
   }

diff --git a/src/test/java/io/wcm/handler/commons/servlets/impl/HtxPageExtensionMapperTest.java b/src/test/java/io/wcm/handler/commons/servlets/impl/HtxPageExtensionMapperTest.java
@@ -19,12 +19,14 @@
  */
 package io.wcm.handler.commons.servlets.impl;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.sling.api.SlingHttpServletRequest;
@@ -102,4 +104,15 @@ void testComplexUrl() throws Exception {
     verifyNoMoreInteractions(response);
   }
 
+  @Test
+  void testNoRequestDispatcher() throws Exception {
+    HtxPageExtensionMapper underTest = context.registerInjectActivateService(new HtxPageExtensionMapper(), "enabled", true);
+
+    when(request.getRequestDispatcher(anyString())).thenReturn(null);
+
+    assertThrows(ServletException.class, () -> {
+      underTest.doGet(request, response);
+    });
+  }
+
 }