[jbossweb-commits] JBossWeb SVN: r2183 - in branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java: org/apache/el/util and 1 other directory.
Author: aogburn
Date: 2013-04-15 12:50:26 -0400 (Mon, 15 Apr 2013)
New Revision: 2183
Modified:
branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/javax/el/BeanELResolver.java
branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/org/apache/el/util/ConcurrentCache.java
Log:
[JBPAPP-10706] commit changes
Modified: branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/javax/el/BeanELResolver.java
===================================================================
--- branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/javax/el/BeanELResolver.java 2013-04-12
20:40:34 UTC (rev 2182)
+++ branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/javax/el/BeanELResolver.java 2013-04-15
16:50:26 UTC (rev 2183)
@@ -324,7 +324,9 @@
public V get(K key) {
V value = this.eden.get(key);
if (value == null) {
- value = this.longterm.get(key);
+ synchronized (longterm) {
+ value = this.longterm.get(key);
+ }
if (value != null) {
this.eden.put(key, value);
}
@@ -334,7 +336,9 @@
public void put(K key, V value) {
if (this.eden.size() >= this.size) {
- this.longterm.putAll(this.eden);
+ synchronized (longterm) {
+ this.longterm.putAll(this.eden);
+ }
this.eden.clear();
}
this.eden.put(key, value);
Modified:
branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/org/apache/el/util/ConcurrentCache.java
===================================================================
---
branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/org/apache/el/util/ConcurrentCache.java 2013-04-12
20:40:34 UTC (rev 2182)
+++
branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/org/apache/el/util/ConcurrentCache.java 2013-04-15
16:50:26 UTC (rev 2183)
@@ -21,7 +21,9 @@
public V get(K k) {
V v = this.eden.get(k);
if (v == null) {
- v = this.longterm.get(k);
+ synchronized (longterm) {
+ value = this.longterm.get(key);
+ }
if (v != null) {
this.eden.put(k, v);
}
@@ -31,7 +33,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);