ISPN-1200 - Nullpointer exception when calling channel.truncate(0); o…

…n org.infinispan.loaders.file.FileCacheStore$BufferedFileSync.purge
infinispan · Jun 27, 2011 · 655cb53 · 655cb53
1 parent bc5d272
commit 655cb53
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java b/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java
@@ -491,6 +491,15 @@ public void purge(File f) throws IOException {
          // cos any cached file channel write won't change the file's exists
          // status. So, clear the file rather than delete it.
          FileChannel channel = streams.get(f.getPath());
+         if (channel == null) {
+            channel = createChannel(f);
+            String path = f.getPath();
+            FileChannel existingChannel = streams.putIfAbsent(path, channel);
+            if (existingChannel != null) {
+               Util.close(channel);
+               channel = existingChannel;
+            }
+         }
          channel.truncate(0);
          // Apart from truncating, it's necessary to reset the position!
          channel.position(0);

diff --git a/core/src/test/java/org/infinispan/loaders/BaseCacheStoreTest.java b/core/src/test/java/org/infinispan/loaders/BaseCacheStoreTest.java
@@ -125,6 +125,9 @@ public void testLoadAndStoreImmortal() throws CacheLoaderException {
       assert cs.load("k").getMaxIdle() == -1;
       assert !cs.load("k").isExpired();
       assert cs.containsKey("k");
+
+      boolean removed = cs.remove("k2");
+      assert !removed;
    }
 
    public void testLoadAndStoreWithLifespan() throws Exception {

diff --git a/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreTest.java b/core/src/test/java/org/infinispan/loaders/file/FileCacheStoreTest.java
@@ -122,6 +122,22 @@ public void testBucketRemoval() throws Exception {
       checkBucketExists(b);
    }
 
+   public void testCacheStoreRebootable() throws Exception {
+      String key = "testCacheStoreRebootable";
+      InternalCacheEntry se = InternalEntryFactory.create(key, "initialValue");
+      fcs.store(se);
+      Bucket b = fcs.loadBucketContainingKey(key);
+
+      //stop and restart it:
+      fcs.stop();
+      fcs.start();
+
+      InternalCacheEntry entry = b.getEntry(key);
+      entry.setValue("updatedValue");
+      fcs.updateBucket(b);
+      "updatedValue".equals(fcs.load(key).getValue());
+   }
+
    protected void checkBucketExists(Bucket b) {
       File file = new File(fcs.root, b.getBucketIdAsString());
       assert file.exists();