root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix DispatcherServlet warnings 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4379 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Chris Beams 2011-05-30 12:54:24 +00:00
parent c28157344b
commit c7754d6d9b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
View File

@ -125,6 +125,7 @@ import org.springframework.web.util.WebUtils;
* @see org.springframework.web.servlet.mvc.Controller * @see org.springframework.web.servlet.mvc.Controller
* @see org.springframework.web.context.ContextLoaderListener * @see org.springframework.web.context.ContextLoaderListener
*/ */
@SuppressWarnings("serial")
public class DispatcherServlet extends FrameworkServlet { public class DispatcherServlet extends FrameworkServlet {
/** Well-known name for the MultipartResolver object in the bean factory for this namespace. */ /** Well-known name for the MultipartResolver object in the bean factory for this namespace. */
@ -647,7 +648,7 @@ public class DispatcherServlet extends FrameworkServlet {
List<T> strategies = new ArrayList<T>(classNames.length); List<T> strategies = new ArrayList<T>(classNames.length);
for (String className : classNames) { for (String className : classNames) {
try { try {
Class clazz = ClassUtils.forName(className, DispatcherServlet.class.getClassLoader()); Class<?> clazz = ClassUtils.forName(className, DispatcherServlet.class.getClassLoader());
Object strategy = createDefaultStrategy(context, clazz); Object strategy = createDefaultStrategy(context, clazz);
strategies.add((T) strategy); strategies.add((T) strategy);
} }
@ -700,7 +701,7 @@ public class DispatcherServlet extends FrameworkServlet {
if (WebUtils.isIncludeRequest(request)) { if (WebUtils.isIncludeRequest(request)) {
logger.debug("Taking snapshot of request attributes before include"); logger.debug("Taking snapshot of request attributes before include");
attributesSnapshot = new HashMap<String, Object>(); attributesSnapshot = new HashMap<String, Object>();
Enumeration attrNames = request.getAttributeNames(); Enumeration<?> attrNames = request.getAttributeNames();
while (attrNames.hasMoreElements()) { while (attrNames.hasMoreElements()) {
String attrName = (String) attrNames.nextElement(); String attrName = (String) attrNames.nextElement();
if (this.cleanupAfterInclude || attrName.startsWith("org.springframework.web.servlet")) { if (this.cleanupAfterInclude || attrName.startsWith("org.springframework.web.servlet")) {
@ -1120,13 +1121,13 @@ public class DispatcherServlet extends FrameworkServlet {
* @param request current HTTP request * @param request current HTTP request
* @param attributesSnapshot the snapshot of the request attributes before the include * @param attributesSnapshot the snapshot of the request attributes before the include
*/ */
private void restoreAttributesAfterInclude(HttpServletRequest request, Map attributesSnapshot) { private void restoreAttributesAfterInclude(HttpServletRequest request, Map<?,?> attributesSnapshot) {
logger.debug("Restoring snapshot of request attributes after include"); logger.debug("Restoring snapshot of request attributes after include");
// Need to copy into separate Collection here, to avoid side effects // Need to copy into separate Collection here, to avoid side effects
// on the Enumeration when removing attributes. // on the Enumeration when removing attributes.
Set<String> attrsToCheck = new HashSet<String>(); Set<String> attrsToCheck = new HashSet<String>();
Enumeration attrNames = request.getAttributeNames(); Enumeration<?> attrNames = request.getAttributeNames();
while (attrNames.hasMoreElements()) { while (attrNames.hasMoreElements()) {
String attrName = (String) attrNames.nextElement(); String attrName = (String) attrNames.nextElement();
if (this.cleanupAfterInclude || attrName.startsWith("org.springframework.web.servlet")) { if (this.cleanupAfterInclude || attrName.startsWith("org.springframework.web.servlet")) {