From e4e4ba42f6874e2c8e46f2d9c3cb9fa83f8a31b9 Mon Sep 17 00:00:00 2001 From: James Ahlborn Date: Thu, 26 Mar 2015 18:39:47 +0000 Subject: [PATCH] need to compare primitive short git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@928 f203690c-595d-4dc9-a70b-905162fa7fd2 --- .../com/healthmarketscience/jackcess/impl/query/QueryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); 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")); } -- 2.39.5