openjava-software
diff --git a/‎src/main/java/org/lmdbjava/Txn.java‎
Lines changed: 35 additions & 2 deletions b/‎src/main/java/org/lmdbjava/Txn.java‎
Lines changed: 35 additions & 2 deletions
diff --git a/‎src/test/java/org/lmdbjava/TxnTest.java‎
Lines changed: 25 additions & 1 deletion b/‎src/test/java/org/lmdbjava/TxnTest.java‎
Lines changed: 25 additions & 1 deletion
@@ -32,7 +32,7 @@
  */
 public final class Txn implements AutoCloseable {
 
-  private boolean committed;
+  private boolean committed = false;
   private final boolean readOnly;
   private boolean reset = false;
   final Env env;
@@ -214,6 +214,24 @@ public void reset() throws ReadOnlyRequiredException, ResetException {
     reset = true;
   }
 
+  void checkNotCommitted() throws CommittedException {
+    if (committed) {
+      throw new CommittedException();
+    }
+  }
+
+  void checkReadOnly() throws ReadOnlyRequiredException {
+    if (!readOnly) {
+      throw new ReadOnlyRequiredException();
+    }
+  }
+
+  void checkWritesAllowed() throws ReadWriteRequiredException {
+    if (readOnly) {
+      throw new ReadWriteRequiredException();
+    }
+  }
+
   /**
    * Transaction must abort, has a child, or is invalid.
    */
@@ -251,7 +269,7 @@ public static final class CommittedException extends LmdbException {
      * Creates a new instance.
      */
     public CommittedException() {
-      super("Transaction has already been opened");
+      super("Transaction has already been committed");
     }
   }
 
@@ -285,6 +303,21 @@ public ReadOnlyRequiredException() {
     }
   }
 
+  /**
+   * The current transaction is not a read-write transaction.
+   */
+  public static class ReadWriteRequiredException extends LmdbException {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Creates a new instance.
+     */
+    public ReadWriteRequiredException() {
+      super("Not a read-write transaction");
+    }
+  }
+
   /**
    * The current transaction has already been reset.
    */
 
@@ -20,6 +20,7 @@
 import org.lmdbjava.Txn.CommittedException;
 import org.lmdbjava.Txn.NotResetException;
 import org.lmdbjava.Txn.ReadOnlyRequiredException;
+import org.lmdbjava.Txn.ReadWriteRequiredException;
 import org.lmdbjava.Txn.ResetException;
 import static org.lmdbjava.TxnFlags.MDB_RDONLY;
 
@@ -41,8 +42,27 @@ public void before() throws Exception {
 
   }
 
+  @Test(expected = CommittedException.class)
+  public void testCheckNotCommitted() throws Exception {
+    final Txn tx = new Txn(env, MDB_RDONLY);
+    tx.commit();
+    tx.checkNotCommitted();
+  }
+
+  @Test(expected = ReadOnlyRequiredException.class)
+  public void testCheckReadOnly() throws Exception {
+    final Txn tx = new Txn(env);
+    tx.checkReadOnly();
+  }
+
+  @Test(expected = ReadWriteRequiredException.class)
+  public void testCheckWritesAllowed() throws Exception {
+    final Txn tx = new Txn(env, MDB_RDONLY);
+    tx.checkWritesAllowed();
+  }
+
   @Test
-  @Ignore
+  @Ignore(value = "Travis CI failure; suspect older liblmdb version")
   public void testGetId() throws Exception {
     Txn tx = new Txn(env);
     Dbi db = new Dbi(tx, DB_1, MDB_CREATE);
@@ -112,6 +132,8 @@ public void txReadOnly() throws Exception {
     assertThat(tx.isCommitted(), is(false));
     assertThat(tx.isReadOnly(), is(true));
     assertThat(tx.isReset(), is(false));
+    tx.checkNotCommitted();
+    tx.checkReadOnly();
     tx.reset();
     assertThat(tx.isReset(), is(true));
     tx.renew();
@@ -126,6 +148,8 @@ public void txReadWrite() throws Exception {
     assertThat(tx.getParent(), is(nullValue()));
     assertThat(tx.isCommitted(), is(false));
     assertThat(tx.isReadOnly(), is(false));
+    tx.checkNotCommitted();
+    tx.checkWritesAllowed();
     tx.commit();
     assertThat(tx.isCommitted(), is(true));
   }