You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2010/10/19 17:57:29 UTC
svn commit: r1024295 -
/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java
Author: mgrigorov
Date: Tue Oct 19 15:57:29 2010
New Revision: 1024295
URL: http://svn.apache.org/viewvc?rev=1024295&view=rev
Log:
WICKET-3115 source code link doesn't work in wicket-examples 1.5 - request mappers demo
LocaleFirstMapper should be able to deal with Urls which have no the locale encoded as a segment.
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java?rev=1024295&r1=1024294&r2=1024295&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java Tue Oct 19 15:57:29 2010
@@ -70,14 +70,17 @@ public class LocaleFirstMapper extends A
if (!Strings.isEmpty(localeAsString))
{
Locale locale = LocaleHelper.parseLocale(localeAsString);
- Session.get().setLocale(locale);
-
- // now that we have proccessed the first segment we need to strip from the url
- Url url = request.getUrl();
- url.getSegments().remove(0);
-
- // create a request based on the new url
- request = request.cloneWithUrl(url);
+ if (locale != null)
+ {
+ Session.get().setLocale(locale);
+
+ // now that we have proccessed the first segment we need to strip from the url
+ Url url = request.getUrl();
+ url.getSegments().remove(0);
+
+ // create a request based on the new url
+ request = request.cloneWithUrl(url);
+ }
}
}