master
Juergen Hoeller 14 years ago
parent b58e19b04c
commit e4792aaf33
  1. 8
      org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestContext.java
  2. 7
      org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
  3. 2
      org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java

@ -1,5 +1,5 @@
/*
* Copyright 2002-2009 the original author or authors.
* Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -415,9 +415,6 @@ public class RequestContext {
* <p><b>Note this implementation will correctly resolve to the URI of any
* originating root request in the presence of a forwarded request. However, this
* can only work when the Servlet 2.4 'forward' request attributes are present.
* For use in a Servlet 2.3 environment, you can rely on
* {@link org.springframework.web.servlet.view.InternalResourceView}
* to add these prior to dispatching the request.</b>
* <p>Delegates to the UrlPathHelper for decoding.
* @see #getQueryString
* @see org.springframework.web.util.UrlPathHelper#getOriginatingRequestUri
@ -434,9 +431,6 @@ public class RequestContext {
* <p><b>Note this implementation will correctly resolve to the query string of any
* originating root request in the presence of a forwarded request. However, this
* can only work when the Servlet 2.4 'forward' request attributes are present.
* For use in a Servlet 2.3 environment, you can rely on
* {@link org.springframework.web.servlet.view.InternalResourceView}
* to add these prior to dispatching the request.</b>
* <p>Delegates to the UrlPathHelper for decoding.
* @see #getRequestUri
* @see org.springframework.web.util.UrlPathHelper#getOriginatingQueryString

@ -1,5 +1,5 @@
/*
* Copyright 2002-2007 the original author or authors.
* Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -26,7 +26,7 @@ import org.springframework.web.util.ExpressionEvaluationUtils;
* <p>Provides a "htmlEscape" property for explicitly specifying whether to
* apply HTML escaping. If not set, a page-level default (e.g. from the
* HtmlEscapeTag) or an application-wide default (the "defaultHtmlEscape"
* context-param in web.xml) is used.
* context-param in <code>web.xml</code>) is used.
*
* @author Juergen Hoeller
* @since 1.1
@ -46,8 +46,7 @@ public abstract class HtmlEscapingAwareTag extends RequestContextAwareTag {
* @see HtmlEscapeTag#setDefaultHtmlEscape
*/
public void setHtmlEscape(String htmlEscape) throws JspException {
this.htmlEscape =
new Boolean(ExpressionEvaluationUtils.evaluateBoolean("htmlEscape", htmlEscape, pageContext));
this.htmlEscape = ExpressionEvaluationUtils.evaluateBoolean("htmlEscape", htmlEscape, pageContext);
}
/**

@ -283,8 +283,6 @@ public class UrlPathHelper {
/**
* Return the query string part of the given request's URL. If this is a forwarded request,
* correctly resolves to the query string of the original request.
* <p>Relies on the Servlet 2.4 'forward' attributes. These attributes may be set by
* other components when running in a Servlet 2.3 environment.
* @param request current HTTP request
* @return the query string
*/

Loading…
Cancel
Save