]> source.dussan.org Git - jackcess.git/commitdiff
need to compare primitive short
authorJames Ahlborn <jtahlborn@yahoo.com>
Thu, 26 Mar 2015 18:39:47 +0000 (18:39 +0000)
committerJames Ahlborn <jtahlborn@yahoo.com>
Thu, 26 Mar 2015 18:39:47 +0000 (18:39 +0000)
git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@928 f203690c-595d-4dc9-a70b-905162fa7fd2

src/main/java/com/healthmarketscience/jackcess/impl/query/QueryImpl.java

index 6007a16d88d9a9e6f8d3e52a5b4f8139baae5c46..8206190dba0e6e47170d573c042d0ab68270e637 100644 (file)
@@ -303,7 +303,7 @@ public abstract class QueryImpl implements Query
         comboJoins = new ArrayList<Row>();
         comboJoinMap.put(key, comboJoins);
       } else {
-        if(comboJoins.get(0).flag != join.flag) {
+        if(comboJoins.get(0).flag != (short)join.flag) {
           throw new IllegalStateException(withErrorContext(
               "Mismatched join flags for combo joins"));
         }