From f89ee377ab4b197959191849e8acfba16f7cbda0 Mon Sep 17 00:00:00 2001
From: broneill <bronee@gmail.com>
Date: Mon, 25 Apr 2016 23:01:01 +0000
Subject: Add explicit int->boolean conversions, as required by JDK 1.8.0_91.

---
 src/main/java/com/amazon/carbonado/gen/StorableGenerator.java           | 2 ++
 src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java | 2 ++
 2 files changed, 4 insertions(+)
 mode change 100644 => 100755 src/main/java/com/amazon/carbonado/gen/StorableGenerator.java
 mode change 100644 => 100755 src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java

(limited to 'src')

diff --git a/src/main/java/com/amazon/carbonado/gen/StorableGenerator.java b/src/main/java/com/amazon/carbonado/gen/StorableGenerator.java
old mode 100644
new mode 100755
index 59312c8..b1d529c
--- 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
old mode 100644
new mode 100755
index 7fbf3a5..c4accab
--- 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);
         }
 
-- 
cgit v1.2.3