Small simplification - 'result' cannot be null at that stage
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6971f879 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6971f879 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6971f879 Branch: refs/heads/master Commit: 6971f879e64ea96b7612184b1dea910e90a9dd0c Parents: d84c337 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Mar 6 10:12:01 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Mar 6 10:12:01 2014 +0200 ---------------------------------------------------------------------- .../apache/wicket/examples/requestmapper/LocaleHelper.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/6971f879/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java index 64b0230..d120233 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java @@ -32,7 +32,7 @@ public class LocaleHelper static Locale parseLocale(final String localeAsString, final Locale defaultLocale) { - Locale result = null; + Locale result; final int idxOfUnderbar = localeAsString.indexOf('_'); if (idxOfUnderbar > 0) @@ -48,12 +48,6 @@ public class LocaleHelper result = new Locale(lang); } - - if (result == null) - { - result = defaultLocale; - } - return result; }
