From 224e36948412b258a9e8f4336aa06e5f3645220b Mon Sep 17 00:00:00 2001 From: QBNemo Date: Mon, 24 Apr 2017 23:39:19 +0800 Subject: [PATCH 1/2] Reuse constant in DispatcherServlet See gh-1398 --- .../springframework/web/servlet/DispatcherServlet.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java index ce69a0d9953..68ef3c9768c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java @@ -264,7 +264,11 @@ public class DispatcherServlet extends FrameworkServlet { */ private static final String DEFAULT_STRATEGIES_PATH = "DispatcherServlet.properties"; - + /** + * Common prefix that DispatcherServlet's default strategy attributes start with. + */ + private static final String DEFAULT_STRATEGIES_PREFIX = "org.springframework.web.servlet"; + /** Additional logger to use when no mapped handler is found for a request. */ protected static final Log pageNotFoundLogger = LogFactory.getLog(PAGE_NOT_FOUND_LOG_CATEGORY); @@ -279,7 +283,7 @@ public class DispatcherServlet extends FrameworkServlet { defaultStrategies = PropertiesLoaderUtils.loadProperties(resource); } catch (IOException ex) { - throw new IllegalStateException("Could not load 'DispatcherServlet.properties': " + ex.getMessage()); + throw new IllegalStateException("Could not load '" + DEFAULT_STRATEGIES_PATH + "': " + ex.getMessage()); } } @@ -874,7 +878,7 @@ public class DispatcherServlet extends FrameworkServlet { Enumeration attrNames = request.getAttributeNames(); while (attrNames.hasMoreElements()) { String attrName = (String) attrNames.nextElement(); - if (this.cleanupAfterInclude || attrName.startsWith("org.springframework.web.servlet")) { + if (this.cleanupAfterInclude || attrName.startsWith(DEFAULT_STRATEGIES_PREFIX)) { attributesSnapshot.put(attrName, request.getAttribute(attrName)); } } From 239b7086c676321b48b1b094704b4995417a188b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 25 Apr 2017 10:06:51 +0200 Subject: [PATCH 2/2] Polish "Reuse constant in DispatcherServlet" Closes gh-1398 --- .../org/springframework/web/servlet/DispatcherServlet.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java index 68ef3c9768c..a7b7a0ed6b6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java @@ -267,8 +267,8 @@ public class DispatcherServlet extends FrameworkServlet { /** * Common prefix that DispatcherServlet's default strategy attributes start with. */ - private static final String DEFAULT_STRATEGIES_PREFIX = "org.springframework.web.servlet"; - + private static final String DEFAULT_STRATEGIES_PREFIX = "org.springframework.web.servlet"; + /** Additional logger to use when no mapped handler is found for a request. */ protected static final Log pageNotFoundLogger = LogFactory.getLog(PAGE_NOT_FOUND_LOG_CATEGORY); @@ -1352,7 +1352,7 @@ public class DispatcherServlet extends FrameworkServlet { Enumeration attrNames = request.getAttributeNames(); while (attrNames.hasMoreElements()) { String attrName = (String) attrNames.nextElement(); - if (this.cleanupAfterInclude || attrName.startsWith("org.springframework.web.servlet")) { + if (this.cleanupAfterInclude || attrName.startsWith(DEFAULT_STRATEGIES_PREFIX)) { attrsToCheck.add(attrName); } }