summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/navigator
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2012-09-06 18:44:16 +0300
committerJohannes Dahlström <johannesd@vaadin.com>2012-09-06 18:44:16 +0300
commit553f67b697e749263a133413a77be64175b23c59 (patch)
treeb2e248991aef57b3eeef6d63bccbcb6a28ec1789 /server/src/com/vaadin/navigator
parentabe89fe6abda4d6ba4afe2c87572a7d02f71c234 (diff)
downloadvaadin-framework-553f67b697e749263a133413a77be64175b23c59.tar.gz
vaadin-framework-553f67b697e749263a133413a77be64175b23c59.zip
Separate view name from parameters with a slash in StaticViewProvider as well
Diffstat (limited to 'server/src/com/vaadin/navigator')
-rw-r--r--server/src/com/vaadin/navigator/Navigator.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/src/com/vaadin/navigator/Navigator.java b/server/src/com/vaadin/navigator/Navigator.java
index 2f42acb320..f05d3678a5 100644
--- a/server/src/com/vaadin/navigator/Navigator.java
+++ b/server/src/com/vaadin/navigator/Navigator.java
@@ -223,7 +223,8 @@ public class Navigator implements Serializable {
if (null == navigationState) {
return null;
}
- if (navigationState.startsWith(viewName)) {
+ if (navigationState.equals(viewName)
+ || navigationState.startsWith(viewName + "/")) {
return viewName;
}
return null;