aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorJames Ahlborn <jtahlborn@yahoo.com>2015-03-26 18:39:47 +0000
committerJames Ahlborn <jtahlborn@yahoo.com>2015-03-26 18:39:47 +0000
commite4e4ba42f6874e2c8e46f2d9c3cb9fa83f8a31b9 (patch)
treedad94f16a6cd9ab8596379a84697dca99fd25f77 /src/main
parent33f5df43947a06e0f49efa09cfd4a5b692601d07 (diff)
downloadjackcess-e4e4ba42f6874e2c8e46f2d9c3cb9fa83f8a31b9.tar.gz
jackcess-e4e4ba42f6874e2c8e46f2d9c3cb9fa83f8a31b9.zip
need to compare primitive short
git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@928 f203690c-595d-4dc9-a70b-905162fa7fd2
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/healthmarketscience/jackcess/impl/query/QueryImpl.java2
1 files changed, 1 insertions, 1 deletions
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"));
}