summaryrefslogtreecommitdiffstats
path: root/src/java/com/healthmarketscience
diff options
context:
space:
mode:
authorJames Ahlborn <jtahlborn@yahoo.com>2009-06-14 02:45:38 +0000
committerJames Ahlborn <jtahlborn@yahoo.com>2009-06-14 02:45:38 +0000
commitcc98d27ddb6331dbd7e13d889f32098a6f98060d (patch)
tree3d3abf2440b08a972116df22b7edc4f8efaed922 /src/java/com/healthmarketscience
parent4471ce1f6f61f75fa8ffa3629861a97f101d5235 (diff)
downloadjackcess-cc98d27ddb6331dbd7e13d889f32098a6f98060d.tar.gz
jackcess-cc98d27ddb6331dbd7e13d889f32098a6f98060d.zip
minor tweaks
git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@399 f203690c-595d-4dc9-a70b-905162fa7fd2
Diffstat (limited to 'src/java/com/healthmarketscience')
-rw-r--r--src/java/com/healthmarketscience/jackcess/query/Query.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/java/com/healthmarketscience/jackcess/query/Query.java b/src/java/com/healthmarketscience/jackcess/query/Query.java
index 0f5dfc5..15189b3 100644
--- a/src/java/com/healthmarketscience/jackcess/query/Query.java
+++ b/src/java/com/healthmarketscience/jackcess/query/Query.java
@@ -319,7 +319,7 @@ public abstract class Query
comboJoins = new ArrayList<Row>();
comboJoinMap.put(key, comboJoins);
} else {
- if(comboJoins.get(0).flag != join.flag) {
+ if((short)comboJoins.get(0).flag != (short)join.flag) {
throw new IllegalStateException(
"Mismatched join flags for combo joins");
}