[jbossweb-commits] JBossWeb SVN: r2305 - branches/JBOSSWEB_2_1_10_GA_JBPAPP-10900/java/org/apache/jasper/runtime.
Author: aogburn
Date: 2013-11-08 14:12:17 -0500 (Fri, 08 Nov 2013)
New Revision: 2305
Modified:
branches/JBOSSWEB_2_1_10_GA_JBPAPP-10900/java/org/apache/jasper/runtime/PageContextImpl.java
Log:
[JBPAPP-10900] merge JBWEB-284
Modified:
branches/JBOSSWEB_2_1_10_GA_JBPAPP-10900/java/org/apache/jasper/runtime/PageContextImpl.java
===================================================================
---
branches/JBOSSWEB_2_1_10_GA_JBPAPP-10900/java/org/apache/jasper/runtime/PageContextImpl.java 2013-11-08
18:03:49 UTC (rev 2304)
+++
branches/JBOSSWEB_2_1_10_GA_JBPAPP-10900/java/org/apache/jasper/runtime/PageContextImpl.java 2013-11-08
19:12:17 UTC (rev 2305)
@@ -421,8 +421,13 @@
return REQUEST_SCOPE;
if (session != null) {
- if (session.getAttribute(name) != null)
- return SESSION_SCOPE;
+ try {
+ if (session.getAttribute(name) != null)
+ return SESSION_SCOPE;
+ } catch(IllegalStateException ise) {
+ // Session has been invalidated.
+ // Ignore and fall through to application scope.
+ }
}
if (context.getAttribute(name) != null)
@@ -464,7 +469,12 @@
return o;
if (session != null) {
- o = session.getAttribute(name);
+ try {
+ o = session.getAttribute(name);
+ } catch(IllegalStateException ise) {
+ // Session has been invalidated.
+ // Ignore and fall through to application scope.
+ }
if (o != null)
return o;
}
@@ -528,17 +538,17 @@
}
private void doRemoveAttribute(String name) {
- try {
- removeAttribute(name, PAGE_SCOPE);
- removeAttribute(name, REQUEST_SCOPE);
- if (session != null) {
- removeAttribute(name, SESSION_SCOPE);
- }
- removeAttribute(name, APPLICATION_SCOPE);
- } catch (Exception ex) {
- // we remove as much as we can, and
- // simply ignore possible exceptions
- }
+ removeAttribute(name, PAGE_SCOPE);
+ removeAttribute(name, REQUEST_SCOPE);
+ if( session != null ) {
+ try {
+ removeAttribute(name, SESSION_SCOPE);
+ } catch(IllegalStateException ise) {
+ // Session has been invalidated.
+ // Ignore and fall throw to application scope.
+ }
+ }
+ removeAttribute(name, APPLICATION_SCOPE);
}
public JspWriter getOut() {
Property changes on:
branches/JBOSSWEB_2_1_10_GA_JBPAPP-10900/java/org/apache/jasper/runtime/PageContextImpl.java
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/2.1.x/java/org/apache/jasper/runtime/PageContextImpl.java:2292
/trunk/java/org/apache/jasper/runtime/PageContextImpl.java:1009