Fix route registration after refactoring (#396)

vaadin · Feb 1, 2019 · 5dee054 · 5dee054
1 parent 4beac77
commit 5dee054
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/VaadinServletContextInitializer.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/VaadinServletContextInitializer.java
@@ -92,7 +92,12 @@ public void contextInitialized(ServletContextEvent event) {
                     Set<Class<? extends Component>> navigationTargets = validateRouteClasses(
                             routeClasses.stream());
 
-                    RouteConfiguration.forRegistry(registry).setRoutes(navigationTargets);
+                    RouteConfiguration routeConfiguration = RouteConfiguration
+                            .forRegistry(registry);
+                    routeConfiguration.update(() -> {
+                       routeConfiguration.getHandledRegistry().clean();
+                        navigationTargets.forEach(routeConfiguration::setAnnotatedRoute);
+                    });
                     registry.setPwaConfigurationClass(validatePwaClass(routeClasses.stream()));
                 } catch (InvalidRouteConfigurationException e) {
                     throw new IllegalStateException(e);