Author: hthomann
Date: Sun Oct 18 19:52:10 2015
New Revision: 1709312
URL: http://svn.apache.org/viewvc?rev=1709312&view=rev
Log:
OPENJPA-2609: Sporadic ClassCastException occurs under heavy load when
QuerySQLCache is enabled. Merged 2.1.x changes to trunk.
Modified:
openjpa/trunk/ (props changed)
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java
Propchange: openjpa/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 18 19:52:10 2015
@@ -1,6 +1,6 @@
/openjpa/branches/1.0.x:736493
/openjpa/branches/2.0.x:1504611
-/openjpa/branches/2.1.x:1415379,1415398,1485010,1513249,1517838,1530146,1533218,1533280,1539188,1569528,1575444,1591536,1636464,1655218,1662610,1673300,1673491,1686894,1709201
+/openjpa/branches/2.1.x:1415379,1415398,1485010,1513249,1517838,1530146,1533218,1533280,1539188,1569528,1575444,1591536,1636464,1655218,1662610,1673300,1673491,1686894,1709201,1709309
/openjpa/branches/2.2.1.x:1415367,1415413,1415425,1504719,1508186,1530347,1533222,1539193,1651808,1686910
/openjpa/branches/2.2.x:1384400,1415459-1415460,1415469,1485013,1530364,1533223,1580898,1580939,1591681,1631786,1641906,1642555,1666312,1686911,1700884,1702143
/openjpa/branches/2.3.x:1533462,1535560,1536912,1540277,1564121
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java?rev=1709312&r1=1709311&r2=1709312&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java
Sun Oct 18 19:52:10 2015
@@ -105,18 +105,25 @@ public class PreparedQueryCacheImpl impl
}
/**
- * Cache the given query keyed by its identifier. Does not cache if the
- * identifier matches any exclusion pattern or has been marked as
- * non-cachable. Also register the identifier as not cachable against
- * the matched exclusion pattern.
+ * Cache the given query keyed by its identifier. Does not cache if the
+ * identifier matches any exclusion pattern or has been marked as
+ * non-cachable. Also register the identifier as not cachable against
the
+ * matched exclusion pattern.
*/
public boolean cache(PreparedQuery q) {
lock(false);
try {
String id = q.getIdentifier();
+
+ // OPENJPA-2609: Make sure another thread didn't add
the 'id'
+ // while holding the 'lock'.
+ if (_delegate.containsKey(id)) {
+ return false;
+ }
+
if (Boolean.FALSE.equals(isCachable(id))) {
if (_log != null && _log.isTraceEnabled())
- _log.trace(_loc.get("prepared-query-not-cachable", id));
+
_log.trace(_loc.get("prepared-query-not-cachable", id));
return false;
}
Exclusion exclusion = getMatchedExclusionPattern(id);
@@ -125,8 +132,8 @@ public class PreparedQueryCacheImpl impl
return false;
}
_delegate.put(id, q);
- if (_log != null && _log.isTraceEnabled())
- _log.trace(_loc.get("prepared-query-cached", id));
+ if (_log != null && _log.isTraceEnabled())
+ _log.trace(_loc.get("prepared-query-cached",
id));
return true;
} finally {
unlock(false);
