Minor auto-formatting and test coverage following merge of lmdbjava#67

bp-alex · bp-alex · commit 0da45e9910fc · 2017-08-24T14:28:46.000+10:00
diff --git a/src/main/java/org/lmdbjava/Dbi.java b/src/main/java/org/lmdbjava/Dbi.java
@@ -54,6 +54,7 @@
  */
 public final class Dbi<T> {
 
+  private boolean cleaned;
   private final Comparator<T> compFunc;
   private final T compKeyA;
   private final T compKeyB;
@@ -62,8 +63,6 @@ public final class Dbi<T> {
   private final BufferProxy<T> proxy;
   private final Pointer ptr;
 
-  private boolean isClean;
-
   Dbi(final Env<T> env, final Txn<T> txn, final byte[] name,
       final Comparator<T> comparator, final DbiFlags... flags) {
     this.env = env;
@@ -107,17 +106,6 @@ public void close() {
     LIB.mdb_dbi_close(env.pointer(), ptr);
   }
 
-  private void clean() {
-    if (isClean) {
-      return;
-    }
-    isClean = true;
-    if (compKeyA != null) {
-      proxy.deallocate(compKeyA);
-      proxy.deallocate(compKeyB);
-    }
-  }
-
   /**
    * Starts a new read-write transaction and deletes the key.
    *
@@ -201,10 +189,10 @@ public void drop(final Txn<T> txn) {
 
   /**
    * Drops the database. If delete is set to true, the database will be deleted
-   * and handle will be closed. See {@link #close()} for implication of handle close.
-   * Otherwise, only the data in this database will be dropped.
+   * and handle will be closed. See {@link #close()} for implication of handle
+   * close. Otherwise, only the data in this database will be dropped.
    *
-   * @param txn transaction handle (not null; not committed; must be R-W)
+   * @param txn    transaction handle (not null; not committed; must be R-W)
    * @param delete whether database should be deleted.
    */
   public void drop(final Txn<T> txn, final boolean delete) {
@@ -500,6 +488,17 @@ public Stat stat(final Txn<T> txn) {
         stat.f5_ms_entries.longValue());
   }
 
+  private void clean() {
+    if (cleaned) {
+      return;
+    }
+    cleaned = true;
+    if (compKeyA != null) {
+      proxy.deallocate(compKeyA);
+      proxy.deallocate(compKeyB);
+    }
+  }
+
   /**
    * The specified DBI was changed unexpectedly.
    */
diff --git a/src/test/java/org/lmdbjava/DbiTest.java b/src/test/java/org/lmdbjava/DbiTest.java
@@ -29,7 +29,6 @@
 import static java.nio.ByteBuffer.allocateDirect;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.nCopies;
-
 import java.util.Comparator;
 import java.util.List;
 import java.util.Random;
@@ -176,6 +175,8 @@ public void dropAndDeleteAnonymousDb() {
       assertThat(nameDb.get(txn, dbNameBuffer), is(nullValue()));
       txn.commit();
     }
+    
+    nameDb.close(); // explicit close after drop is OK
   }
 
   @Test
