[infinispan-commits] Infinispan SVN: r888 - in trunk: cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm and 5 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Tue Sep 29 11:25:07 EDT 2009
Author: manik.surtani at jboss.com
Date: 2009-09-29 11:25:07 -0400 (Tue, 29 Sep 2009)
New Revision: 888
Modified:
trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java
trunk/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStore.java
trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/S3CacheStore.java
trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java
trunk/core/src/main/java/org/infinispan/loaders/decorators/AsyncStore.java
trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java
trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java
Log:
More null checks
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-09-29 15:14:03 UTC (rev 887)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java 2009-09-29 15:25:07 UTC (rev 888)
@@ -57,7 +57,6 @@
private static final boolean trace = log.isTraceEnabled();
private BdbjeCacheStoreConfig cfg;
- private Cache cache;
private Environment env;
private StoredClassCatalog catalog;
@@ -78,6 +77,7 @@
*
* @see BdbjeCacheStoreConfig
*/
+ @Override
public void init(CacheLoaderConfig config, Cache cache, Marshaller m) throws CacheLoaderException {
BdbjeCacheStoreConfig cfg = (BdbjeCacheStoreConfig) config;
init(cfg, new BdbjeResourceFactory(cfg), cache, m);
@@ -89,7 +89,6 @@
super.init(cfg, cache, m);
this.cfg = cfg;
this.factory = factory;
- this.cache = cache;
}
/**
Modified: trunk/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStore.java
===================================================================
--- trunk/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStore.java 2009-09-29 15:14:03 UTC (rev 887)
+++ trunk/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStore.java 2009-09-29 15:25:07 UTC (rev 888)
@@ -68,7 +68,6 @@
private RecordManager recman;
private HTree tree;
private BTree expiryTree;
- private Cache cache;
public Class<? extends CacheLoaderConfig> getConfigurationClass() {
return JdbmCacheStoreConfig.class;
@@ -78,7 +77,6 @@
public void init(CacheLoaderConfig clc, Cache cache, Marshaller m) throws CacheLoaderException {
super.init(clc, cache, m);
this.config = (JdbmCacheStoreConfig) clc;
- this.cache = cache;
}
@Override
Modified: trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/S3CacheStore.java
===================================================================
--- trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/S3CacheStore.java 2009-09-29 15:14:03 UTC (rev 887)
+++ trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/S3CacheStore.java 2009-09-29 15:25:07 UTC (rev 888)
@@ -33,9 +33,6 @@
private S3CacheStoreConfig config;
- Cache cache;
- Marshaller marshaller;
-
private S3Connection connection;
private S3Bucket s3Bucket;
@@ -48,8 +45,8 @@
*/
public void init(CacheLoaderConfig cfg, Cache cache, Marshaller m) throws CacheLoaderException {
this.config = (S3CacheStoreConfig) cfg;
- S3Bucket cloudsBucket = null;
- S3Connection cloudsConnection = null;
+ S3Bucket cloudsBucket;
+ S3Connection cloudsConnection;
try {
cloudsConnection = config.getConnectionClass() != null ? (S3Connection) Util.getInstance(config.getConnectionClass()) : new JCloudsConnection();
cloudsBucket = config.getBucketClass()!=null ? (S3Bucket) Util.getInstance(config.getBucketClass()) : new JCloudsBucket();
Modified: trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java 2009-09-29 15:14:03 UTC (rev 887)
+++ trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java 2009-09-29 15:25:07 UTC (rev 888)
@@ -32,15 +32,19 @@
private AbstractCacheStoreConfig config;
private ExecutorService purgerService;
protected Marshaller marshaller;
+ protected Cache cache;
public void init(CacheLoaderConfig config, Cache cache, Marshaller m) throws CacheLoaderException{
this.config = (AbstractCacheStoreConfig) config;
this.marshaller = m;
if (config == null) throw new IllegalStateException("Null config!!!");
- int concurrencyLevel = cache == null ? 16 : cache.getConfiguration().getConcurrencyLevel();
- transactions = new ConcurrentHashMap<GlobalTransaction, List<? extends Modification>>(64, 0.75f, concurrencyLevel);
+ this.cache = cache;
}
+ protected final int getConcurrencyLevel() {
+ return cache == null || cache.getConfiguration() == null? 16 : cache.getConfiguration().getConcurrencyLevel();
+ }
+
public void start() throws CacheLoaderException {
if (config == null) throw new IllegalStateException("Make sure you call super.init() from CacheStore extension");
if (config.isPurgeSynchronously()) {
@@ -48,6 +52,7 @@
} else {
purgerService = Executors.newSingleThreadExecutor();
}
+ transactions = new ConcurrentHashMap<GlobalTransaction, List<? extends Modification>>(64, 0.75f, getConcurrencyLevel());
}
public void stop() throws CacheLoaderException {
Modified: trunk/core/src/main/java/org/infinispan/loaders/decorators/AsyncStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/decorators/AsyncStore.java 2009-09-29 15:14:03 UTC (rev 887)
+++ trunk/core/src/main/java/org/infinispan/loaders/decorators/AsyncStore.java 2009-09-29 15:25:07 UTC (rev 888)
@@ -86,7 +86,7 @@
@Override
public void init(CacheLoaderConfig config, Cache cache, Marshaller m) throws CacheLoaderException {
super.init(config, cache, m);
- concurrencyLevel = cache == null ? 16 : cache.getConfiguration().getConcurrencyLevel();
+ concurrencyLevel = cache == null || cache.getConfiguration() == null ? 16 : cache.getConfiguration().getConcurrencyLevel();
}
public void store(InternalCacheEntry ed) {
Modified: trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java 2009-09-29 15:14:03 UTC (rev 887)
+++ trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java 2009-09-29 15:25:07 UTC (rev 888)
@@ -36,9 +36,7 @@
private static final Log log = LogFactory.getLog(FileCacheStore.class);
private int streamBufferSize;
-
FileCacheStoreConfig config;
- Cache cache;
File root;
/**
@@ -48,10 +46,10 @@
return root;
}
+ @Override
public void init(CacheLoaderConfig config, Cache cache, Marshaller m) throws CacheLoaderException {
super.init(config, cache, m);
this.config = (FileCacheStoreConfig) config;
- this.cache = cache;
}
protected Set<InternalCacheEntry> loadAllLockSafe() throws CacheLoaderException {
Modified: trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java 2009-09-29 15:14:03 UTC (rev 887)
+++ trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java 2009-09-29 15:25:07 UTC (rev 888)
@@ -27,8 +27,6 @@
String storeName = "__DEFAULT_STORES__";
Map<Object, InternalCacheEntry> store;
Cfg config;
- private Marshaller marshaller;
- private Cache cache;
public void store(InternalCacheEntry ed) {
if (ed != null) {
@@ -81,8 +79,6 @@
public void init(CacheLoaderConfig config, Cache cache, Marshaller m) throws CacheLoaderException {
super.init(config, cache, m);
this.config = (Cfg) config;
- this.cache = cache;
- this.marshaller = m;
if (marshaller == null) marshaller = new TestObjectStreamMarshaller();
}
More information about the infinispan-commits
mailing list