Updated Branches: refs/heads/wicket-1.5.x d80606016 -> 9dde3b27e
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/9dde3b27 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9dde3b27 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9dde3b27 Branch: refs/heads/wicket-1.5.x Commit: 9dde3b27e21a25c829be85aa2a4fc4349557f43c Parents: 986e990 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:35:22 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/9dde3b27/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 e63162b..659dd22 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 @@ -189,7 +189,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) {
