Skip to content

Commit e4792aa

Browse files
committed
polishing
1 parent b58e19b commit e4792aa

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestContext.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2009 the original author or authors.
2+
* Copyright 2002-2010 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -415,9 +415,6 @@ public String getContextUrl(String relativeUrl) {
415415
* <p><b>Note this implementation will correctly resolve to the URI of any
416416
* originating root request in the presence of a forwarded request. However, this
417417
* can only work when the Servlet 2.4 'forward' request attributes are present.
418-
* For use in a Servlet 2.3 environment, you can rely on
419-
* {@link org.springframework.web.servlet.view.InternalResourceView}
420-
* to add these prior to dispatching the request.</b>
421418
* <p>Delegates to the UrlPathHelper for decoding.
422419
* @see #getQueryString
423420
* @see org.springframework.web.util.UrlPathHelper#getOriginatingRequestUri
@@ -434,9 +431,6 @@ public String getRequestUri() {
434431
* <p><b>Note this implementation will correctly resolve to the query string of any
435432
* originating root request in the presence of a forwarded request. However, this
436433
* can only work when the Servlet 2.4 'forward' request attributes are present.
437-
* For use in a Servlet 2.3 environment, you can rely on
438-
* {@link org.springframework.web.servlet.view.InternalResourceView}
439-
* to add these prior to dispatching the request.</b>
440434
* <p>Delegates to the UrlPathHelper for decoding.
441435
* @see #getRequestUri
442436
* @see org.springframework.web.util.UrlPathHelper#getOriginatingQueryString

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2007 the original author or authors.
2+
* Copyright 2002-2010 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
2626
* <p>Provides a "htmlEscape" property for explicitly specifying whether to
2727
* apply HTML escaping. If not set, a page-level default (e.g. from the
2828
* HtmlEscapeTag) or an application-wide default (the "defaultHtmlEscape"
29-
* context-param in web.xml) is used.
29+
* context-param in <code>web.xml</code>) is used.
3030
*
3131
* @author Juergen Hoeller
3232
* @since 1.1
@@ -46,8 +46,7 @@ public abstract class HtmlEscapingAwareTag extends RequestContextAwareTag {
4646
* @see HtmlEscapeTag#setDefaultHtmlEscape
4747
*/
4848
public void setHtmlEscape(String htmlEscape) throws JspException {
49-
this.htmlEscape =
50-
new Boolean(ExpressionEvaluationUtils.evaluateBoolean("htmlEscape", htmlEscape, pageContext));
49+
this.htmlEscape = ExpressionEvaluationUtils.evaluateBoolean("htmlEscape", htmlEscape, pageContext);
5150
}
5251

5352
/**

org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,6 @@ public String getOriginatingContextPath(HttpServletRequest request) {
283283
/**
284284
* Return the query string part of the given request's URL. If this is a forwarded request,
285285
* correctly resolves to the query string of the original request.
286-
* <p>Relies on the Servlet 2.4 'forward' attributes. These attributes may be set by
287-
* other components when running in a Servlet 2.3 environment.
288286
* @param request current HTTP request
289287
* @return the query string
290288
*/

0 commit comments

Comments
 (0)