Add missing context path to UI pathInfo (#315)

Fixes #252
vaadin · Jun 1, 2018 · 5943ba8 · 5943ba8
1 parent 2a0ed9a
commit 5943ba8
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/vaadin-spring/src/main/java/com/vaadin/spring/server/SpringUIProvider.java b/vaadin-spring/src/main/java/com/vaadin/spring/server/SpringUIProvider.java
@@ -163,10 +163,15 @@ public Class<? extends UI> getUIClass(
             }
         }
 
+        // Sometimes pathInfo does not contain leading slash
+        if (!pathInfo.isEmpty() && !pathInfo.startsWith("/")) {
+            pathInfo = "/" + pathInfo;
+        }
+
         // Pass the path info to the UI through request
         uiClassSelectionEvent.getRequest().setAttribute(
                 ApplicationConstants.UI_ROOT_PATH,
-                (pathInfo.startsWith("/") ? "" : "/") + pathInfo);
+                uiClassSelectionEvent.getRequest().getContextPath() + pathInfo);
 
         return ui;