MaskedFlag to detect null elements in array

bp-alex · bp-alex · commit 06497cc41d5d · 2016-06-17T14:36:21.000+10:00
diff --git a/src/main/java/org/lmdbjava/MaskedFlag.java b/src/main/java/org/lmdbjava/MaskedFlag.java
@@ -42,6 +42,9 @@ static int mask(final MaskedFlag... flags) {
 
     int result = 0;
     for (MaskedFlag flag : flags) {
+      if (flag == null) {
+        continue;
+      }
       result |= flag.getMask();
     }
     return result;
diff --git a/src/test/java/org/lmdbjava/MaskedFlagTest.java b/src/test/java/org/lmdbjava/MaskedFlagTest.java
@@ -17,6 +17,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.arrayWithSize;
 import org.junit.Test;
 import static org.lmdbjava.EnvFlags.MDB_FIXEDMAP;
 import static org.lmdbjava.EnvFlags.MDB_NOSYNC;
@@ -54,6 +55,10 @@ public void masking() {
     final EnvFlags[] emptyFlags = new EnvFlags[]{};
     assertThat(mask(emptyFlags), is(0));
 
+    final EnvFlags[] nullElementZero = new EnvFlags[]{null};
+    assertThat(nullElementZero, is(arrayWithSize(1)));
+    assertThat(mask(nullElementZero), is(0));
+
     assertThat(mask(MDB_NOSYNC), is(MDB_NOSYNC.getMask()));
 
     final int expected = MDB_NOSYNC.getMask() + MDB_FIXEDMAP.getMask();

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,9 @@ static int mask(final MaskedFlag... flags) {`
`42`	`42`
`43`	`43`	`int result = 0;`
`44`	`44`	`for (MaskedFlag flag : flags) {`
	`45`	`+ if (flag == null) {`
	`46`	`+ continue;`
	`47`	`+ }`
`45`	`48`	`result \|= flag.getMask();`
`46`	`49`	`}`
`47`	`50`	`return result;`