Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-10182 Backport HHH-7898 for JTA environment only 

* made access to the synchronization concurrency-safe
* use Caches.withinTx as transaction wrap
This commit is contained in:
Radim Vansa 2015-10-16 14:12:49 +02:00
parent dbb30213ed
commit d0831d4511
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java vendored
View File

@ -44,6 +44,7 @@ import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@ -146,9 +147,12 @@ public class QueryResultsRegionImpl extends BaseTransactionalDataRegion implemen
if (transaction != null) {
Map<Object, PostTransactionQueryUpdate> map = transactionContext.get(transaction);
if (map != null) {
PostTransactionQueryUpdate update = map.get(key);
if (update != null && update.getValue() != null) {
return update.getValue();
PostTransactionQueryUpdate update = map.get(key);
if (update != null) {
Object value = update.getValue();
if (value != null) {
return value;
}
}
}
}
@ -221,7 +225,7 @@ public class QueryResultsRegionImpl extends BaseTransactionalDataRegion implemen
private class PostTransactionQueryUpdate implements Synchronization {
private final Transaction transaction;
private final Object key;
private Object value;
private volatile Object value;
public PostTransactionQueryUpdate(Transaction transaction, Object key, Object value) {
this.transaction = transaction;
@ -244,6 +248,7 @@ public class QueryResultsRegionImpl extends BaseTransactionalDataRegion implemen
@Override
public void afterCompletion(int status) {
transactionContext.remove(transaction);
final Object value = this.value;
if (value == null) {
return;
}
@ -255,12 +260,13 @@ public class QueryResultsRegionImpl extends BaseTransactionalDataRegion implemen
try {
suspended = tm.suspend();
if (putCacheRequiresTransaction) {
tm.begin();
try {
putCache.put(key, value);
} finally {
tm.commit();
}
Caches.withinTx(tm, new Callable<Void>() {
@Override
public Void call() throws Exception {
putCache.put(key, value);
return null;
}
});
} else {
putCache.put(key, value);
}