Updated Branches:
  refs/heads/master 1dad22939 -> 141fb6f25

WICKET-3753 check existence of Session


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/141fb6f2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/141fb6f2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/141fb6f2

Branch: refs/heads/master
Commit: 141fb6f2574b4bae7d087252bf3098ead65ab0cf
Parents: 1dad229
Author: svenmeier <[email protected]>
Authored: Thu Jul 19 20:42:51 2012 +0200
Committer: svenmeier <[email protected]>
Committed: Thu Jul 19 20:42:51 2012 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/wicket/Localizer.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/141fb6f2/wicket-core/src/main/java/org/apache/wicket/Localizer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Localizer.java 
b/wicket-core/src/main/java/org/apache/wicket/Localizer.java
index c9cb780..cae46ff 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Localizer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Localizer.java
@@ -547,7 +547,15 @@ public class Localizer
                                                converter = Application.get()
                                                        .getConverterLocator()
                                                        
.getConverter(value.getClass());
-                                               locale = 
Session.get().getLocale();
+
+                                               if (Session.exists())
+                                               {
+                                                       locale = 
Session.get().getLocale();
+                                               }
+                                               else
+                                               {
+                                                       locale = 
Locale.getDefault();
+                                               }
                                        }
                                        else
                                        {

Reply via email to