Author: ivaynberg Date: Thu Mar 18 16:37:19 2010 New Revision: 924888 URL: http://svn.apache.org/viewvc?rev=924888&view=rev Log: fallback on default charset for response url encoding
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java?rev=924888&r1=924887&r2=924888&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java Thu Mar 18 16:37:19 2010 @@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import org.apache.wicket.WicketRuntimeException; +import org.apache.wicket.protocol.http.RequestUtils; import org.apache.wicket.request.Url; import org.apache.wicket.request.http.WebResponse; import org.apache.wicket.util.lang.Checks; @@ -208,7 +209,7 @@ public class ServletWebResponse extends } else { - Charset charset = Charset.forName(httpServletRequest.getCharacterEncoding()); + Charset charset = RequestUtils.getCharset(httpServletRequest); Url current = Url.parse(httpServletRequest.getRequestURI(), charset); Url append = Url.parse(url, charset); current.concatSegments(append.getSegments());