Updated Branches: refs/heads/master b663a176d -> 7b57fb14e
Add an additional check for null. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7b57fb14 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7b57fb14 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7b57fb14 Branch: refs/heads/master Commit: 7b57fb14e9710343b3585a57a99997ae05229c49 Parents: b663a17 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Mar 19 15:34:31 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Mar 19 15:34:31 2012 +0200 ---------------------------------------------------------------------- .../apache/wicket/protocol/http/RequestUtils.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/7b57fb14/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java index 6182064..0d87a70 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java @@ -190,7 +190,10 @@ public final class RequestUtils if (request != null) { String charsetName = request.getCharacterEncoding(); - charset = Charset.forName(charsetName); + if (charsetName != null) + { + charset = Charset.forName(charsetName); + } } if (charset == null) {
