MGNL-20935 null / empty / blank

vpro · Jul 24, 2023 · d8b3ed1 · d8b3ed1
1 parent e194aa3
commit d8b3ed1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/nl/vpro/magnolia/module/keycloak/util/MagnoliaReturnToRequestWrapper.java b/src/main/java/nl/vpro/magnolia/module/keycloak/util/MagnoliaReturnToRequestWrapper.java
@@ -7,6 +7,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 
+import org.apache.commons.lang3.StringUtils;
+
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class MagnoliaReturnToRequestWrapper extends HttpServletRequestWrapper {
@@ -18,7 +20,7 @@ public MagnoliaReturnToRequestWrapper(HttpServletRequest request) {
     @Override
     public String getQueryString() {
         String q = super.getQueryString();
-        if (q == null || q.isEmpty()) {
+        if (StringUtils.isBlank(q)) {
             return FormLogin.PARAMETER_RETURN_TO + "=" + URLEncoder.encode(getRequestURI(), UTF_8);
         }
         return q + "&" + FormLogin.PARAMETER_RETURN_TO + "=" + URLEncoder.encode(getRequestURI() + "?" + q, UTF_8);