SONAR-8332 do not generate request id (and don't fail) in safe-mode

2 files changed, 13 insertions, 1 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdFilter.java b/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdFilter.java
index d157116eb4b..01c5f2b3691 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdFilter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdFilter.java
@@ -56,8 +56,12 @@ public class RequestIdFilter implements Filter {
   public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
     RequestIdGenerator requestIdGenerator = platform.getContainer().getComponentByType(RequestIdGenerator.class);
 
-    try (RequestIdMDCStorage mdcStorage = new RequestIdMDCStorage(requestIdGenerator.generate())) {
+    if (requestIdGenerator == null) {
       chain.doFilter(request, response);
+    } else {
+      try (RequestIdMDCStorage mdcStorage = new RequestIdMDCStorage(requestIdGenerator.generate())) {
+        chain.doFilter(request, response);
+      }
     }
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdFilterTest.java
index 41a53c32d29..4ece09fd04b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdFilterTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdFilterTest.java
@@ -84,6 +84,14 @@ public class RequestIdFilterTest {
     } finally {
       assertThat(MDC.get("HTTP_REQUEST_ID")).isNull();
     }
+  }
+
+  @Test
+  public void filter_does_not_fail_when_there_is_no_RequestIdGenerator_in_container() throws IOException, ServletException {
+    Platform platform = mock(Platform.class);
+    when(platform.getContainer()).thenReturn(new ComponentContainer());
+    RequestIdFilter underTest = new RequestIdFilter(platform);
 
+    underTest.doFilter(servletRequest, servletResponse, filterChain);
   }
 }

path: root/server

<?php
$TRANSLATIONS = array(
"_%n minute ago_::_%n minutes ago_" => array(""),
"_%n hour ago_::_%n hours ago_" => array(""),
"_%n day ago_::_%n days ago_" => array(""),
"_%n month ago_::_%n months ago_" => array(""),
"_{count} file conflict_::_{count} file conflicts_" => array("")
);
$PLURAL_FORMS = "nplurals=1; plural=0;";