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

only try to restore attribute if the value differs (ignoring Portlet spec attributes; SPR-6712)

This commit is contained in:
Juergen Hoeller 2010-01-18 15:51:00 +00:00
parent f82563fb6f
commit 88ff3c9a23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -1151,18 +1151,18 @@ public class DispatcherServlet extends FrameworkServlet {
// or removing the attribute, respectively, if appropriate. // or removing the attribute, respectively, if appropriate.
for (String attrName : attrsToCheck) { for (String attrName : attrsToCheck) {
Object attrValue = attributesSnapshot.get(attrName); Object attrValue = attributesSnapshot.get(attrName);
if (attrValue != null) { if (attrValue == null){
if (logger.isDebugEnabled()) {
logger.debug("Restoring original value of attribute [" + attrName + "] after include");
}
request.setAttribute(attrName, attrValue);
}
else {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Removing attribute [" + attrName + "] after include"); logger.debug("Removing attribute [" + attrName + "] after include");
} }
request.removeAttribute(attrName); request.removeAttribute(attrName);
} }
else if (attrValue != request.getAttribute(attrName)) {
if (logger.isDebugEnabled()) {
logger.debug("Restoring original value of attribute [" + attrName + "] after include");
}
request.setAttribute(attrName, attrValue);
}
} }
} }