[hibernate-commits] [hibernate/hibernate-orm] 560d6b: HHH-11304 Invalidations are not cleared when trans...
Branch: refs/heads/5.1
Home: https://github.com/hibernate/hibernate-orm
Commit: 560d6b59c668203fbd9cd1f22b6ef61ab5bd2b41
https://github.com/hibernate/hibernate-orm/commit/560d6b59c668203fbd9cd1f...
Author: Radim Vansa <rvansa(a)redhat.com>
Date: 2017-01-05 (Thu, 05 Jan 2017)
Changed paths:
M
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/BaseInvalidationInterceptor.java
M
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/InvalidationCacheAccessDelegate.java
M
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/InvalidationSynchronization.java
M
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/NonTxInvalidationCacheAccessDelegate.java
M
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/NonTxInvalidationInterceptor.java
M
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/NonTxPutFromLoadInterceptor.java
M
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java
M
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TxInvalidationCacheAccessDelegate.java
M
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TxInvalidationInterceptor.java
M
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TxPutFromLoadInterceptor.java
M
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/BeginInvalidationCommand.java
M
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheCommandInitializer.java
M
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/EndInvalidationCommand.java
M
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/InvalidationTest.java
R
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/CacheCommandsInitializerTest.java
Log Message:
-----------
HHH-11304 Invalidations are not cleared when transaction rolls back
* always use global transaction id (in transactional caches) or command invocation id (in
non-transactional caches) to identifiy the invalidator
* don't use afterInvoke/afterUpdate/unlockItem to end invalidation as this is not
called during rollback
** use Infinispan transaction handling or explicitly registered invalidation to hook into
the process
** move invalidation calls to interceptor stack where we have the identifiers
* don't use deprecated methods for commands marshalling
(cherry picked from commit 294ba74c76efe111daa5c5d1e034e1eba3945591)
Conflicts:
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/InvalidationCacheAccessDelegate.java
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/NonTxInvalidationCacheAccessDelegate.java
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/NonTxPutFromLoadInterceptor.java
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TxInvalidationCacheAccessDelegate.java
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/EndInvalidationCommand.java
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/InvalidationTest.java
Commit: 97fb511083c326c047d0f5890ae32a258aa40632
https://github.com/hibernate/hibernate-orm/commit/97fb511083c326c047d0f58...
Author: Radim Vansa <rvansa(a)redhat.com>
Date: 2017-01-05 (Thu, 05 Jan 2017)
Changed paths:
M
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java
M
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/CollectionRegionAccessStrategyTest.java
Log Message:
-----------
HHH-11304 Replace PutFromLoadValidator properly in CollectionRegionAccessStrategyTest
(cherry picked from commit c94df359d64e4698d77e6cc76357274dbf71ca05)
Conflicts:
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/CollectionRegionAccessStrategyTest.java
Compare: https://github.com/hibernate/hibernate-orm/compare/6d7a14e4a238...97fb511...