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

HHH-6186 Upgraded to latest Infinispan 5.0 CR

This commit is contained in:
Galder Zamarreño 2011-05-17 13:55:44 +02:00
parent fc94dd07eb
commit f01505591d
7 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-infinispan/hibernate-infinispan.gradle
View File

@ -5,7 +5,7 @@ configurations {
} }
dependencies { dependencies {
infinispanVersion = '4.2.1.CR1' infinispanVersion = '5.0.0.CR2'
jnpVersion = '5.0.3.GA' jnpVersion = '5.0.3.GA'
compile(project(':hibernate-core')) compile(project(':hibernate-core'))

6
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java vendored
View File

@ -268,7 +268,7 @@ public abstract class BaseRegion implements Region {
protected boolean handleEvictAllModification(CacheEntryModifiedEvent event) { protected boolean handleEvictAllModification(CacheEntryModifiedEvent event) {
if (!event.isPre() && (replication || event.isOriginLocal()) && CacheHelper.isEvictAllNotification(event.getKey(), event.getValue())) { if (!event.isPre() && (replication || event.isOriginLocal()) && CacheHelper.isEvictAllNotification(event.getKey(), event.getValue())) {
if (log.isTraceEnabled()) log.trace("Set invalid state because marker cache entry was put: {0}", event); if (log.isTraceEnabled()) log.tracef("Set invalid state because marker cache entry was put: {0}", event);
invalidateState.set(InvalidateState.INVALID); invalidateState.set(InvalidateState.INVALID);
return true; return true;
} }
@ -277,13 +277,13 @@ public abstract class BaseRegion implements Region {
@CacheEntryInvalidated @CacheEntryInvalidated
public void entryInvalidated(CacheEntryInvalidatedEvent event) { public void entryInvalidated(CacheEntryInvalidatedEvent event) {
if (log.isTraceEnabled()) log.trace("Cache entry invalidated: {0}", event); if (log.isTraceEnabled()) log.tracef("Cache entry invalidated: {0}", event);
handleEvictAllInvalidation(event); handleEvictAllInvalidation(event);
} }
protected boolean handleEvictAllInvalidation(CacheEntryInvalidatedEvent event) { protected boolean handleEvictAllInvalidation(CacheEntryInvalidatedEvent event) {
if (!event.isPre() && CacheHelper.isEvictAllNotification(event.getKey())) { if (!event.isPre() && CacheHelper.isEvictAllNotification(event.getKey())) {
if (log.isTraceEnabled()) log.trace("Set invalid state because marker cache entry was invalidated: {0}", event); if (log.isTraceEnabled()) log.tracef("Set invalid state because marker cache entry was invalidated: {0}", event);
invalidateState.set(InvalidateState.INVALID); invalidateState.set(InvalidateState.INVALID);
return true; return true;
} }

6
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapterImpl.java vendored
View File

@ -39,7 +39,11 @@ public class AddressAdapterImpl implements AddressAdapter, Externalizable {
private Address address; private Address address;
private AddressAdapterImpl(Address address) { // Required by Java Externalizable
public AddressAdapterImpl() {
}
public AddressAdapterImpl(Address address) {
this.address = address; this.address = address;
} }

8
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheHelper.java vendored
View File

@ -69,10 +69,14 @@ public class CacheHelper {
return key instanceof EvictAll && value == Internal.EVICT; return key instanceof EvictAll && value == Internal.EVICT;
} }
private static class EvictAll implements Externalizable { public static class EvictAll implements Externalizable {
AddressAdapter member; AddressAdapter member;
EvictAll(AddressAdapter member) { // Required by Java Externalizable
public EvictAll() {
}
public EvictAll(AddressAdapter member) {
this.member = member; this.member = member;
} }

4
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/ConcurrentWriteTest.java vendored
View File

@ -175,7 +175,7 @@ public class ConcurrentWriteTest extends SingleNodeTestCase {
assertEquals( customerSlcs.getElementCountInMemory(), 1 ); assertEquals( customerSlcs.getElementCountInMemory(), 1 );
assertEquals( customerSlcs.getEntries().size(), 1 ); assertEquals( customerSlcs.getEntries().size(), 1 );
log.info( "Add contact to customer {0}", customerId ); log.infof( "Add contact to customer {0}", customerId );
SecondLevelCacheStatistics contactsCollectionSlcs = sessionFactory() SecondLevelCacheStatistics contactsCollectionSlcs = sessionFactory()
.getStatistics() .getStatistics()
.getSecondLevelCacheStatistics( Customer.class.getName() + ".contacts" ); .getSecondLevelCacheStatistics( Customer.class.getName() + ".contacts" );
@ -478,7 +478,7 @@ public class ConcurrentWriteTest extends SingleNodeTestCase {
thinkRandomTime(); thinkRandomTime();
++completedIterations; ++completedIterations;
if ( log.isTraceEnabled() ) { if ( log.isTraceEnabled() ) {
log.trace( "Iteration completed {0}", completedIterations ); log.tracef( "Iteration completed {0}", completedIterations );
} }
} }
} }

2
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaTransactionImpl.java vendored
View File

@ -263,7 +263,7 @@ public class DualNodeJtaTransactionImpl implements Transaction {
if (prepareResult != XAResource.XA_RDONLY) if (prepareResult != XAResource.XA_RDONLY)
xaResource.commit(xid, b); xaResource.commit(xid, b);
else else
log.trace("Not committing {0} due to readonly.", xid); log.tracef("Not committing {0} due to readonly.", xid);
} }
@Override @Override

2
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaTransactionImpl.java vendored
View File

@ -265,7 +265,7 @@ public class XaTransactionImpl implements Transaction {
if (prepareResult != XAResource.XA_RDONLY) if (prepareResult != XAResource.XA_RDONLY)
xaResource.commit(xid, b); xaResource.commit(xid, b);
else else
log.trace("Not committing {0} due to readonly.", xid); log.tracef("Not committing {0} due to readonly.", xid);
} }
@Override @Override