diff options
| author | Jesse Morgan <morganjm@amazon.com> | 2016-04-29 13:08:02 -0700 |
|---|---|---|
| committer | Jesse Morgan <morganjm@amazon.com> | 2016-04-29 13:08:02 -0700 |
| commit | 5852af9d5bdff97e2941e00e7ae06a016b05ee2c (patch) | |
| tree | 34f573d2cc2c2da58cc7b5bcb4644e4735dfc9bd /src/main/java/com/amazon/carbonado/gen | |
| parent | f793f4e762ebed02d74938402d704a4fa845cac3 (diff) | |
| parent | 6ea9896550f4c7718ec5ccc1f092a7059956b6ea (diff) | |
Merge branch 'master' into v1.3v1.3
Diffstat (limited to 'src/main/java/com/amazon/carbonado/gen')
| -rwxr-xr-x[-rw-r--r--] | src/main/java/com/amazon/carbonado/gen/StorableGenerator.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/com/amazon/carbonado/gen/StorableGenerator.java b/src/main/java/com/amazon/carbonado/gen/StorableGenerator.java index 59312c8..b1d529c 100644..100755 --- a/src/main/java/com/amazon/carbonado/gen/StorableGenerator.java +++ b/src/main/java/com/amazon/carbonado/gen/StorableGenerator.java @@ -1818,6 +1818,7 @@ public final class StorableGenerator<S extends Storable> { b.loadConstant(PROPERTY_STATE_MASK << ((versionOrdinal & 0xf) * 2));
b.math(Opcode.IAND);
// zero == false, not zero == true
+ b.convert(TypeDesc.INT, TypeDesc.BOOLEAN);
b.returnValue(TypeDesc.BOOLEAN);
}
}
@@ -2481,6 +2482,7 @@ public final class StorableGenerator<S extends Storable> { b.loadConstant(PROPERTY_STATE_MASK << ((ordinal & 0xf) * 2));
b.math(Opcode.IAND);
// zero == false, not zero == true
+ b.convert(TypeDesc.INT, TypeDesc.BOOLEAN);
b.returnValue(TypeDesc.BOOLEAN);
return;
}
|