From 1406551733ddfd8829c053a2d1d84edbbdcd9a97 Mon Sep 17 00:00:00 2001 From: Marcello Barnaba Date: Mon, 9 Aug 2021 15:55:48 +0200 Subject: [PATCH] Add detection of HCL Digital Experience rebranding (#12242) On HCL Digital Experience 8.5.5 CF19, the `getPortalInfo()` method returns "hcl digital experience/8.5", breaking detection of the servlet engine. This ultimately leads to methods such as `getHeader()` to return NULL, as the upstream HTTP request is not retrieved. --- server/src/main/java/com/vaadin/server/VaadinPortlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/vaadin/server/VaadinPortlet.java b/server/src/main/java/com/vaadin/server/VaadinPortlet.java index 16da9757191..1c62117209c 100644 --- a/server/src/main/java/com/vaadin/server/VaadinPortlet.java +++ b/server/src/main/java/com/vaadin/server/VaadinPortlet.java @@ -574,7 +574,7 @@ protected VaadinPortletRequest createVaadinRequest(PortletRequest request) { return new VaadinLiferayRequest(request, service); } - if (portalInfo.contains("websphere portal")) { + if (portalInfo.contains("websphere portal") || portalInfo.contains("hcl digital experience")) { return new VaadinWebSpherePortalRequest(request, service); } if (portalInfo.contains("weblogic portal")) {