diff options
| author | broneill <bronee@gmail.com> | 2016-04-25 23:01:01 +0000 |
|---|---|---|
| committer | Jesse Morgan <morganjm@amazon.com> | 2016-04-29 13:06:09 -0700 |
| commit | f89ee377ab4b197959191849e8acfba16f7cbda0 (patch) | |
| tree | 9db0cc6918e697b1ef2c5a96d33def0aee7bce7b /src/main/java/com/amazon/carbonado | |
| parent | 0265480e804135e33574d8dfd7d4a49b71d0953b (diff) | |
Add explicit int->boolean conversions, as required by JDK 1.8.0_91.
Diffstat (limited to 'src/main/java/com/amazon/carbonado')
| -rwxr-xr-x[-rw-r--r--] | src/main/java/com/amazon/carbonado/gen/StorableGenerator.java | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java | 2 |
2 files changed, 4 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;
}
diff --git a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java index 7fbf3a5..c4accab 100644..100755 --- a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java +++ b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java @@ -1239,6 +1239,7 @@ class JDBCStorableGenerator<S extends Storable> { yieldConAndHandleException(b, supportVar, tryBeforeCon, conVar, tryAfterCon, true);
b.loadLocal(updateCount);
+ b.convert(TypeDesc.INT, TypeDesc.BOOLEAN);
b.returnValue(TypeDesc.BOOLEAN);
}
@@ -1277,6 +1278,7 @@ class JDBCStorableGenerator<S extends Storable> { yieldConAndHandleException(b, supportVar, tryBeforeCon, conVar, tryAfterCon, true);
b.loadLocal(resultVar);
+ b.convert(TypeDesc.INT, TypeDesc.BOOLEAN);
b.returnValue(TypeDesc.BOOLEAN);
}
|