[jbossweb-commits] JBossWeb SVN: r2294 - in branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10891: java/org/apache/jasper/runtime and 1 other directory.

[jbossweb-commits at lists.jboss.org]

Author: aogburn
Date: 2013-10-25 16:46:37 -0400 (Fri, 25 Oct 2013)
New Revision: 2294

Modified:
   branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10891/build.xml
   branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10891/java/org/apache/jasper/runtime/PageContextImpl.java
Log:
[JBPAPP-10891] commit JBWEB-284 one-off fix

Modified: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10891/build.xml
===================================================================
--- branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10891/build.xml	2013-10-25 19:55:25 UTC (rev 2293)
+++ branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10891/build.xml	2013-10-25 20:46:37 UTC (rev 2294)
@@ -843,7 +843,7 @@
 
   <target name="build-jasper-jdt-src">
   	<jar destfile="${jasper-jdt-src.jar}" index="true">
-  		<fileset dir="${jasper-jdt-src.home}/src/plugins/org.eclipse.jdt.core/model">
+<fileset dir="${jasper-jdt-src.home}/plugins/org.eclipse.jdt.core/model">
   			<include name="org/eclipse/jdt/core/compiler/**"/>
   			<include name="org/eclipse/jdt/internal/compiler/**"/>
   			<include name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/>

Modified: branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10891/java/org/apache/jasper/runtime/PageContextImpl.java
===================================================================
--- branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10891/java/org/apache/jasper/runtime/PageContextImpl.java	2013-10-25 19:55:25 UTC (rev 2293)
+++ branches/JBOSSWEB_2_1_12_GA_patch03_JBPAPP-10891/java/org/apache/jasper/runtime/PageContextImpl.java	2013-10-25 20:46:37 UTC (rev 2294)
@@ -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_12_GA_patch03_JBPAPP-10891/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