Merge branch '2.0.x'

kekemu · May 10, 2018 · 0b76fc8 · 0b76fc8
2 parents 36c7602 + fbf9744
commit 0b76fc8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/...ot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java b/...ot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
@@ -154,16 +154,17 @@ public void setUrlPatterns(Collection<String> urlPatterns) {
 	}
 
 	/**
-	 * Return a mutable collection of URL patterns that the filter will be registered
-	 * against.
+	 * Return a mutable collection of URL patterns, as defined in the Servlet
+	 * specification, that the filter will be registered against.
 	 * @return the URL patterns
 	 */
 	public Collection<String> getUrlPatterns() {
 		return this.urlPatterns;
 	}
 
 	/**
-	 * Add URL patterns that the filter will be registered against.
+	 * Add URL patterns, as defined in the Servlet specification, that the filter will be
+	 * registered against.
 	 * @param urlPatterns the URL patterns
 	 */
 	public void addUrlPatterns(String... urlPatterns) {

diff --git a/...ring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java b/...ring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java
@@ -129,15 +129,16 @@ public void setUrlMappings(Collection<String> urlMappings) {
 	}
 
 	/**
-	 * Return a mutable collection of the URL mappings for the servlet.
+	 * Return a mutable collection of the URL mappings, as defined in the Servlet
+	 * specification, for the servlet.
 	 * @return the urlMappings
 	 */
 	public Collection<String> getUrlMappings() {
 		return this.urlMappings;
 	}
 
 	/**
-	 * Add URL mappings for the servlet.
+	 * Add URL mappings, as defined in the Servlet specification, for the servlet.
 	 * @param urlMappings the mappings to add
 	 * @see #setUrlMappings(Collection)
 	 */