Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FacesRequestAttributes falls back to ExternalContext as session mutex

Browse Source 
Issue: SPR-12402
This commit is contained in:
Juergen Hoeller
2016-04-07 11:41:32 +02:00
parent ed14ae60e5
commit 042d8d0b4c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -217,7 +217,7 @@ public class FacesRequestAttributes implements RequestAttributes {
Object session = getExternalContext().getSession(true);
try {
// Both HttpSession and PortletSession have a getId() method.
Method getIdMethod = session.getClass().getMethod("getId", new Class<?>[0]);
Method getIdMethod = session.getClass().getMethod("getId");
return ReflectionUtils.invokeMethod(getIdMethod, session).toString();
}
catch (NoSuchMethodException ex) {
@@ -227,12 +227,12 @@ public class FacesRequestAttributes implements RequestAttributes {
@Override
public Object getSessionMutex() {
// Enforce presence of a session first to allow listeners
// to create the mutex attribute, if any.
Object session = getExternalContext().getSession(true);
Object mutex = getExternalContext().getSessionMap().get(WebUtils.SESSION_MUTEX_ATTRIBUTE);
// Enforce presence of a session first to allow listeners to create the mutex attribute
ExternalContext externalContext = getExternalContext();
Object session = externalContext.getSession(true);
Object mutex = externalContext.getSessionMap().get(WebUtils.SESSION_MUTEX_ATTRIBUTE);
if (mutex == null) {
mutex = session;
mutex = (session != null ? session : externalContext);
}
return mutex;
}