Author: bmaxwell
Date: 2011-06-08 00:03:12 -0400 (Wed, 08 Jun 2011)
New Revision: 1735
Modified:
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/javax/el/BeanELResolver.java
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/org/apache/catalina/connector/Request.java
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/org/apache/el/lang/ExpressionBuilder.java
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/org/apache/el/util/ConcurrentCache.java
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/xdocs/news/changelog.xml
Log:
[JBPAPP-6688] - JBWEB-185: Fix thread safety in two EL caches.
Modified:
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/javax/el/BeanELResolver.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/javax/el/BeanELResolver.java 2011-06-08
03:23:33 UTC (rev 1734)
+++
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/javax/el/BeanELResolver.java 2011-06-08
04:03:12 UTC (rev 1735)
@@ -25,6 +25,8 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
@@ -34,11 +36,30 @@
public class BeanELResolver extends ELResolver {
- private final boolean readOnly;
+ private static final int CACHE_SIZE;
+ private static final String CACHE_SIZE_PROP =
+ "org.apache.el.BeanELResolver.CACHE_SIZE";
- private final ConcurrentCache<String, BeanProperties> cache = new
ConcurrentCache<String, BeanProperties>(
- 1000);
+ static {
+ if (System.getSecurityManager() == null) {
+ CACHE_SIZE = Integer.parseInt(
+ System.getProperty(CACHE_SIZE_PROP, "1000"));
+ } else {
+ CACHE_SIZE = AccessController.doPrivileged(
+ new PrivilegedAction<Integer>() {
+ public Integer run() {
+ return Integer.valueOf(
+ System.getProperty(CACHE_SIZE_PROP, "1000"));
+ }
+ }).intValue();
+ }
+ }
+ private final boolean readOnly;
+
+ private final ConcurrentCache<String, BeanProperties> cache =
+ new ConcurrentCache<String, BeanProperties>(CACHE_SIZE);
+
public BeanELResolver() {
this.readOnly = false;
}
@@ -296,37 +317,40 @@
}
return null;
}
-
- private final static class ConcurrentCache<K,V> {
- private final int size;
- private final Map<K,V> eden;
- private final Map<K,V> longterm;
-
- public ConcurrentCache(int size) {
- this.size = size;
- this.eden = new ConcurrentHashMap<K,V>(size);
- this.longterm = new WeakHashMap<K,V>(size);
- }
-
- public V get(K key) {
- V value = this.eden.get(key);
- if (value == null) {
- value = this.longterm.get(key);
- if (value != null) {
- this.eden.put(key, value);
- }
- }
- return value;
- }
-
- public void put(K key, V value) {
- if (this.eden.size() >= this.size) {
- this.longterm.putAll(this.eden);
- this.eden.clear();
- }
- this.eden.put(key, value);
- }
+ private final static class ConcurrentCache<K,V> {
- }
+ private final int size;
+ private final Map<K,V> eden;
+ private final Map<K,V> longterm;
+
+ public ConcurrentCache(int size) {
+ this.size = size;
+ this.eden = new ConcurrentHashMap<K,V>(size);
+ this.longterm = new WeakHashMap<K,V>(size);
+ }
+
+ public V get(K key) {
+ V value = this.eden.get(key);
+ if (value == null) {
+ synchronized (longterm) {
+ value = this.longterm.get(key);
+ }
+ if (value != null) {
+ this.eden.put(key, value);
+ }
+ }
+ return value;
+ }
+
+ public void put(K key, V value) {
+ if (this.eden.size() >= this.size) {
+ synchronized (longterm) {
+ this.longterm.putAll(this.eden);
+ }
+ this.eden.clear();
+ }
+ this.eden.put(key, value);
+ }
+ }
}
Property changes on:
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/javax/el/BeanELResolver.java
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/2.1.x/java/javax/el/BeanELResolver.java:1639
Modified:
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/org/apache/catalina/connector/Request.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/org/apache/catalina/connector/Request.java 2011-06-08
03:23:33 UTC (rev 1734)
+++
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/org/apache/catalina/connector/Request.java 2011-06-08
04:03:12 UTC (rev 1735)
@@ -1341,8 +1341,8 @@
}
if (context == null)
- return;
-
+ return;
+
// Notify interested application event listeners
Object listeners[] = context.getApplicationEventListeners();
if ((listeners == null) || (listeners.length == 0))
@@ -1414,8 +1414,8 @@
}
if (context == null)
- return;
-
+ return;
+
// Notify interested application event listeners
Object listeners[] = context.getApplicationEventListeners();
if ((listeners == null) || (listeners.length == 0))
Property changes on:
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/org/apache/catalina/connector/Request.java
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/2.1.x/java/org/apache/catalina/connector/Request.java:1639
Modified:
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/org/apache/el/lang/ExpressionBuilder.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/org/apache/el/lang/ExpressionBuilder.java 2011-06-08
03:23:33 UTC (rev 1734)
+++
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/org/apache/el/lang/ExpressionBuilder.java 2011-06-08
04:03:12 UTC (rev 1735)
@@ -50,7 +50,7 @@
*/
public final class ExpressionBuilder implements NodeVisitor {
- private static final ConcurrentCache<String, Node> cache = new
ConcurrentCache<String, Node>(5000);
+ private static final ConcurrentCache<String, Node> cache = new
ConcurrentCache<String, Node>(10000);
private FunctionMapper fnMapper;
Property changes on:
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/org/apache/el/lang/ExpressionBuilder.java
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/2.1.x/java/org/apache/el/lang/ExpressionBuilder.java:1639
Modified:
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/org/apache/el/util/ConcurrentCache.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/org/apache/el/util/ConcurrentCache.java 2011-06-08
03:23:33 UTC (rev 1734)
+++
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/org/apache/el/util/ConcurrentCache.java 2011-06-08
04:03:12 UTC (rev 1735)
@@ -37,7 +37,9 @@
public V get(K k) {
V v = this.eden.get(k);
if (v == null) {
- v = this.longterm.get(k);
+ synchronized (longterm) {
+ v = this.longterm.get(k);
+ }
if (v != null) {
this.eden.put(k, v);
}
@@ -47,7 +49,9 @@
public void put(K k, V v) {
if (this.eden.size() >= size) {
- this.longterm.putAll(this.eden);
+ synchronized (longterm) {
+ this.longterm.putAll(this.eden);
+ }
this.eden.clear();
}
this.eden.put(k, v);
Property changes on:
branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/src/share/classes/org/apache/el/util/ConcurrentCache.java
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/2.1.x/java/org/apache/el/util/ConcurrentCache.java:1639
Modified: branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/xdocs/news/changelog.xml
===================================================================
--- branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/xdocs/news/changelog.xml 2011-06-08
03:23:33 UTC (rev 1734)
+++ branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/xdocs/news/changelog.xml 2011-06-08
04:03:12 UTC (rev 1735)
@@ -12,6 +12,30 @@
</properties>
<body>
+<section name="JBoss Web 2.1.11.GA (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <jira>148</jira>: Fix possible NPE on request.set/removeAttribute.
(remm)
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ <jboss-jira>JBPAPP-5293</jboss-jira>: ConcurrentModificationException
in HandshakeCompletedNotify-Thread. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <jira>185</jira>: Fix cache thread safety issue for EL expression
builder.
+ Patch submitted by Takayoshi Kimura. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
<section name="JBossWeb 1.0">
<subsection name="General">
Property changes on: branches/JBOSSWEB_2_0_0_GA_CP15_JBPAPP-6688/xdocs/news/changelog.xml
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/2.1.x/webapps/docs/changelog.xml:1639