Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 09:36:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4789 WW-3788 Uses full variable name

Browse Source
This commit is contained in:
Lukasz Lenart
2020-04-28 08:01:26 +02:00
parent f071c9d0ed
commit a504a16eae
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java
+7 -7
View File
@@ -262,9 +262,9 @@ public class ScopeInterceptor extends AbstractInterceptor implements PreResultLi
}
protected void after(ActionInvocation invocation, String result) throws Exception {
Map<String, Object> ses = ActionContext.getContext().getSession();
if ( ses != null) {
unlock(ses);
Map<String, Object> session = ActionContext.getContext().getSession();
if ( session != null) {
unlock(session);
}
}
@@ -282,14 +282,14 @@ public class ScopeInterceptor extends AbstractInterceptor implements PreResultLi
}
String key = getKey(invocation);
Map<String, Object> app = ActionContext.getContext().getApplication();
Map<String, Object> application = ActionContext.getContext().getApplication();
final ValueStack stack = ActionContext.getContext().getValueStack();
LOG.debug("scope interceptor before");
if (application != null)
for (String string : application) {
Object attribute = app.get(key + string);
if (this.application != null)
for (String string : this.application) {
Object attribute = application.get(key + string);
if (attribute != null) {
LOG.debug("Application scoped variable set {} = {}", string, String.valueOf(attribute));
stack.setValue(string, nullConvert(attribute));