From: James Ahlborn <jtahlborn@yahoo.com>
Date: Thu, 26 Mar 2015 18:39:47 +0000 (+0000)
Subject: need to compare primitive short
X-Git-Tag: jackcess-2.1.0~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e4e4ba42f6874e2c8e46f2d9c3cb9fa83f8a31b9;p=jackcess.git

need to compare primitive short

git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@928 f203690c-595d-4dc9-a70b-905162fa7fd2
---

diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/query/QueryImpl.java b/src/main/java/com/healthmarketscience/jackcess/impl/query/QueryImpl.java
index 6007a16..8206190 100644
--- a/src/main/java/com/healthmarketscience/jackcess/impl/query/QueryImpl.java
+++ b/src/main/java/com/healthmarketscience/jackcess/impl/query/QueryImpl.java
@@ -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"));
         }