[infinispan-commits] Infinispan SVN: r255 - in trunk: core/src/main/java/org/infinispan and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-05-12 05:43:17 -0400 (Tue, 12 May 2009)
New Revision: 255

Modified:
   trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java
   trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java
   trunk/core/src/main/java/org/infinispan/CacheDelegate.java
Log:
Fixed compile warnings

Modified: trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java	2009-05-12 09:13:12 UTC (rev 254)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java	2009-05-12 09:43:17 UTC (rev 255)
@@ -399,7 +399,7 @@
     */
    public Set<InternalCacheEntry> loadAll() throws CacheLoaderException {
       try {
-         return new HashSet(cacheMap.values());
+         return new HashSet<InternalCacheEntry>(cacheMap.values());
       } catch (RuntimeException caught) {
          throw convertToCacheLoaderException("error loading all entries", caught);
       }

Modified: trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java	2009-05-12 09:13:12 UTC (rev 254)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java	2009-05-12 09:43:17 UTC (rev 255)
@@ -96,11 +96,9 @@
     * @throws com.sleepycat.je.DatabaseException
     *          if the StoredMap cannot be opened.
     */
-   public StoredMap createStoredMapViewOfDatabase(Database database, StoredClassCatalog classCatalog, Marshaller m) throws DatabaseException {
+   public StoredMap<Object, InternalCacheEntry> createStoredMapViewOfDatabase(Database database, StoredClassCatalog classCatalog, Marshaller m) throws DatabaseException {
       EntryBinding<Object> storedEntryKeyBinding =
             new SerialBinding<Object>(classCatalog, Object.class);
-//      EntryBinding storedEntryValueBinding =
-//            new SerialBinding(classCatalog, InternalCacheEntry.class);
       EntryBinding<InternalCacheEntry> storedEntryValueBinding = new InternalCacheEntryBinding(m);
       try {
          return new StoredMap<Object, InternalCacheEntry>(database,

Modified: trunk/core/src/main/java/org/infinispan/CacheDelegate.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/CacheDelegate.java	2009-05-12 09:13:12 UTC (rev 254)
+++ trunk/core/src/main/java/org/infinispan/CacheDelegate.java	2009-05-12 09:43:17 UTC (rev 255)
@@ -61,7 +61,6 @@
 
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -211,7 +210,7 @@
    }
 
    public void putForExternalRead(K key, V value) {
-      putForExternalRead(key, value, null);
+      putForExternalRead(key, value, (Flag[]) null);
    }
 
    public void evict(K key) {
@@ -268,7 +267,7 @@
       LockControlCommand command = commandsFactory.buildLockControlCommand(keys, false);
       invoker.invoke(getInvocationContext(), command);
    }
-   
+
    public void start() {
       componentRegistry.start();
       defaultLifespan = config.getExpirationLifespan();
@@ -313,7 +312,7 @@
 
    public void putForExternalRead(K key, V value, Flag... flags) {
       InvocationContext invocationContext = getInvocationContext();
-      invocationContext.setFlags(flags);
+      if (flags != null) invocationContext.setFlags(flags);
       Transaction ongoingTransaction = null;
       try {
          if (transactionManager != null && (ongoingTransaction = transactionManager.getTransaction()) != null) {