[infinispan-commits] Infinispan SVN: r2598 - in branches/4.2.x: core/src/main/java/org/infinispan/context/impl and 4 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Mon Oct 25 11:31:33 EDT 2010
Author: manik.surtani at jboss.com
Date: 2010-10-25 11:31:32 -0400 (Mon, 25 Oct 2010)
New Revision: 2598
Modified:
branches/4.2.x/core/src/main/java/org/infinispan/config/Configuration.java
branches/4.2.x/core/src/main/java/org/infinispan/context/impl/AbstractTxInvocationContext.java
branches/4.2.x/core/src/main/java/org/infinispan/interceptors/DeadlockDetectingInterceptor.java
branches/4.2.x/core/src/main/java/org/infinispan/transaction/xa/DldGlobalTransaction.java
branches/4.2.x/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java
branches/4.2.x/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoActions.java
branches/4.2.x/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java
Log:
Use genericized empty set, map and list methods rather than constants
Modified: branches/4.2.x/core/src/main/java/org/infinispan/config/Configuration.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/config/Configuration.java 2010-10-25 15:27:09 UTC (rev 2597)
+++ branches/4.2.x/core/src/main/java/org/infinispan/config/Configuration.java 2010-10-25 15:31:32 UTC (rev 2598)
@@ -1069,7 +1069,7 @@
*/
@SuppressWarnings("unchecked")
public List<CustomInterceptorConfig> getCustomInterceptors() {
- return customInterceptors.customInterceptors == null ? Collections.EMPTY_LIST : customInterceptors.customInterceptors;
+ return customInterceptors.customInterceptors == null ? Collections.<CustomInterceptorConfig>emptyList() : customInterceptors.customInterceptors;
}
/**
Modified: branches/4.2.x/core/src/main/java/org/infinispan/context/impl/AbstractTxInvocationContext.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/context/impl/AbstractTxInvocationContext.java 2010-10-25 15:27:09 UTC (rev 2597)
+++ branches/4.2.x/core/src/main/java/org/infinispan/context/impl/AbstractTxInvocationContext.java 2010-10-25 15:31:32 UTC (rev 2598)
@@ -25,7 +25,7 @@
}
public Set<Object> getAffectedKeys() {
- return affectedKeys == null ? Collections.EMPTY_SET : affectedKeys;
+ return affectedKeys == null ? Collections.emptySet() : affectedKeys;
}
public void addAffectedKeys(Object... keys) {
Modified: branches/4.2.x/core/src/main/java/org/infinispan/interceptors/DeadlockDetectingInterceptor.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/interceptors/DeadlockDetectingInterceptor.java 2010-10-25 15:27:09 UTC (rev 2597)
+++ branches/4.2.x/core/src/main/java/org/infinispan/interceptors/DeadlockDetectingInterceptor.java 2010-10-25 15:31:32 UTC (rev 2598)
@@ -19,6 +19,8 @@
import java.util.Collections;
import java.util.Set;
+import static java.util.Collections.emptySet;
+
/**
* This interceptor populates the {@link org.infinispan.transaction.xa.DldGlobalTransaction} with
* appropriate information needed in order to accomplish deadlock detection. It MUST process populate data before the
@@ -79,7 +81,7 @@
}
Object result = invokeNextInterceptor(ctx, command);
if (ctx.isOriginLocal()) {
- globalTransaction.setRemoteLockIntention(Collections.EMPTY_SET);
+ globalTransaction.setRemoteLockIntention(emptySet());
}
return result;
}
Modified: branches/4.2.x/core/src/main/java/org/infinispan/transaction/xa/DldGlobalTransaction.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/transaction/xa/DldGlobalTransaction.java 2010-10-25 15:27:09 UTC (rev 2597)
+++ branches/4.2.x/core/src/main/java/org/infinispan/transaction/xa/DldGlobalTransaction.java 2010-10-25 15:31:32 UTC (rev 2598)
@@ -12,6 +12,8 @@
import java.util.Collections;
import java.util.Set;
+import static java.util.Collections.emptySet;
+
/**
* This class is used when deadlock detection is enabled.
*
@@ -30,9 +32,9 @@
private transient volatile Object localLockIntention;
- protected volatile Set<Object> remoteLockIntention = Collections.EMPTY_SET;
+ protected volatile Set<Object> remoteLockIntention = emptySet();
- private volatile Set<Object> locksAtOrigin = Collections.EMPTY_SET;
+ private volatile Set<Object> locksAtOrigin = emptySet();
public DldGlobalTransaction() {
}
@@ -160,12 +162,13 @@
}
@Override
+ @SuppressWarnings("unchecked")
public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
DldGlobalTransaction ddGt = (DldGlobalTransaction) super.readObject(input);
ddGt.setCoinToss(input.readLong());
Object locksAtOriginObj = input.readObject();
if (locksAtOriginObj == null) {
- ddGt.setLocksHeldAtOrigin(Collections.EMPTY_SET);
+ ddGt.setLocksHeldAtOrigin(emptySet());
} else {
ddGt.setLocksHeldAtOrigin((Set<Object>) locksAtOriginObj);
}
Modified: branches/4.2.x/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java 2010-10-25 15:27:09 UTC (rev 2597)
+++ branches/4.2.x/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java 2010-10-25 15:31:32 UTC (rev 2598)
@@ -34,6 +34,8 @@
import java.util.concurrent.Executors;
import java.util.concurrent.RejectedExecutionException;
+import static java.util.Collections.emptySet;
+
/**
* Repository for {@link org.infinispan.transaction.xa.RemoteTransaction} and {@link
* org.infinispan.transaction.xa.TransactionXaAdapter}s (locally originated transactions).
@@ -86,7 +88,7 @@
public Set<Object> getLockedKeysForRemoteTransaction(GlobalTransaction gtx) {
RemoteTransaction transaction = remoteTransactions.get(gtx);
- if (transaction == null) return Collections.EMPTY_SET;
+ if (transaction == null) return emptySet();
return transaction.getLockedKeys();
}
Modified: branches/4.2.x/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoActions.java
===================================================================
--- branches/4.2.x/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoActions.java 2010-10-25 15:27:09 UTC (rev 2597)
+++ branches/4.2.x/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoActions.java 2010-10-25 15:31:32 UTC (rev 2598)
@@ -47,6 +47,8 @@
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.remoting.transport.Address;
+import static java.util.Collections.emptyList;
+
/**
* DemoActions does some basic operations on the Lucene index,
* to be used by DemoDriver to show base operations on Lucene.
@@ -89,7 +91,7 @@
} catch (IOException ioe) {
// not recommended: in the simple demo this likely means that the index was not yet
// initialized, so returning empty list.
- return Collections.EMPTY_LIST;
+ return emptyList();
}
}
Modified: branches/4.2.x/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java
===================================================================
--- branches/4.2.x/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java 2010-10-25 15:27:09 UTC (rev 2597)
+++ branches/4.2.x/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java 2010-10-25 15:31:32 UTC (rev 2598)
@@ -56,6 +56,7 @@
import java.util.Map;
import java.util.Set;
+import static java.util.Collections.emptyList;
import static org.hibernate.search.reader.ReaderProviderHelper.getIndexReaders;
import static org.hibernate.search.util.FilterCacheModeTypeHelper.cacheInstance;
import static org.hibernate.search.util.FilterCacheModeTypeHelper.cacheResults;
@@ -280,7 +281,7 @@
public List<Object> list() throws SearchException {
IndexSearcher searcher = buildSearcher(searchFactory);
- if (searcher == null) return Collections.EMPTY_LIST;
+ if (searcher == null) return emptyList();
try {
More information about the infinispan-commits
mailing list