Refactor ReferenceCounted to return boolean indicating whether all re…

…ferences have been released.
atomix · Sep 4, 2015 · a2537cf · a2537cf
1 parent 60cf261
commit a2537cf
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 11 deletions.
diff --git a/io/src/main/java/net/kuujo/copycat/io/AbstractBuffer.java b/io/src/main/java/net/kuujo/copycat/io/AbstractBuffer.java
@@ -86,13 +86,15 @@ public Buffer acquire() {
   }
 
   @Override
-  public void release() {
+  public boolean release() {
     if (references.decrementAndGet() == 0) {
       if (referenceManager != null)
         referenceManager.release(this);
       else
         bytes.close();
+      return true;
     }
+    return false;
   }
 
   @Override

diff --git a/io/src/main/java/net/kuujo/copycat/io/ReadOnlyBuffer.java b/io/src/main/java/net/kuujo/copycat/io/ReadOnlyBuffer.java
@@ -65,8 +65,8 @@ public Buffer acquire() {
   }
 
   @Override
-  public void release() {
-    root.release();
+  public boolean release() {
+    return root.release();
   }
 
   @Override

diff --git a/io/src/main/java/net/kuujo/copycat/io/SlicedBuffer.java b/io/src/main/java/net/kuujo/copycat/io/SlicedBuffer.java
@@ -75,8 +75,8 @@ public Buffer acquire() {
   }
 
   @Override
-  public void release() {
-    root.release();
+  public boolean release() {
+    return root.release();
   }
 
   @Override

diff --git a/io/src/main/java/net/kuujo/copycat/io/SwappedBuffer.java b/io/src/main/java/net/kuujo/copycat/io/SwappedBuffer.java
@@ -82,8 +82,8 @@ public Buffer acquire() {
   }
 
   @Override
-  public void release() {
-    root.release();
+  public boolean release() {
+    return root.release();
   }
 
   @Override

diff --git a/io/src/main/java/net/kuujo/copycat/util/ReferenceCounted.java b/io/src/main/java/net/kuujo/copycat/util/ReferenceCounted.java
@@ -34,8 +34,10 @@ public interface ReferenceCounted<T> extends AutoCloseable {
 
   /**
    * Releases a reference.
+   *
+   * @return Indicates whether all references to the object have been released.
    */
-  void release();
+  boolean release();
 
   /**
    * Returns the number of open references.

diff --git a/protocol/src/main/java/net/kuujo/copycat/raft/protocol/request/AbstractRequest.java b/protocol/src/main/java/net/kuujo/copycat/raft/protocol/request/AbstractRequest.java
@@ -44,14 +44,16 @@ public T acquire() {
 
   @Override
   @SuppressWarnings("unchecked")
-  public void release() {
+  public boolean release() {
     int refs = references.decrementAndGet();
     if (refs == 0) {
       referenceManager.release((T) this);
+      return true;
     } else if (refs < 0) {
       references.set(0);
       throw new IllegalStateException("cannot dereference non-referenced object");
     }
+    return false;
   }
 
   @Override

diff --git a/protocol/src/main/java/net/kuujo/copycat/raft/protocol/response/AbstractResponse.java b/protocol/src/main/java/net/kuujo/copycat/raft/protocol/response/AbstractResponse.java
@@ -57,14 +57,16 @@ public T acquire() {
 
   @Override
   @SuppressWarnings("unchecked")
-  public void release() {
+  public boolean release() {
     int refs = references.decrementAndGet();
     if (refs == 0) {
       referenceManager.release((T) this);
+      return true;
     } else if (refs < 0) {
       references.set(0);
       throw new IllegalStateException("cannot dereference non-referenced object");
     }
+    return false;
   }
 
   @Override

diff --git a/storage/src/main/java/net/kuujo/copycat/io/storage/Entry.java b/storage/src/main/java/net/kuujo/copycat/io/storage/Entry.java
@@ -110,15 +110,17 @@ public Entry acquire() {
   }
 
   @Override
-  public void release() {
+  public boolean release() {
     int refs = references.decrementAndGet();
     if (refs == 0) {
       if (referenceManager != null)
         referenceManager.release(this);
+      return true;
     } else if (refs < 0) {
       references.set(0);
       throw new IllegalStateException("cannot dereference non-referenced object");
     }
+    return false;
   }
 
   @Override