Array type is irrelevant.
...as far as I can tell. Rip out the code that tried to set up the right array type.
This commit is contained in:
@@ -48,15 +48,7 @@ public abstract class KeySet<T extends PersistentRecord> extends WhereClause
|
|||||||
|
|
||||||
ColumnExp<?>[] keyFields = DepotUtil.getKeyFields(pClass);
|
ColumnExp<?>[] keyFields = DepotUtil.getKeyFields(pClass);
|
||||||
if (keyFields.length == 1) {
|
if (keyFields.length == 1) {
|
||||||
Comparable<?> first = keys.iterator().next().getValues()[0];
|
Comparable<?>[] keyArray = new Comparable<?>[keys.size()];
|
||||||
Comparable<?>[] keyArray;
|
|
||||||
if (first instanceof Integer) {
|
|
||||||
keyArray = new Integer[keys.size()];
|
|
||||||
} else if (first instanceof String) {
|
|
||||||
keyArray = new String[keys.size()];
|
|
||||||
} else {
|
|
||||||
keyArray = new Comparable<?>[keys.size()];
|
|
||||||
}
|
|
||||||
int ii = 0;
|
int ii = 0;
|
||||||
for (Key<T> key : keys) {
|
for (Key<T> key : keys) {
|
||||||
keyArray[ii++] = key.getValues()[0];
|
keyArray[ii++] = key.getValues()[0];
|
||||||
@@ -92,15 +84,7 @@ public abstract class KeySet<T extends PersistentRecord> extends WhereClause
|
|||||||
if (keys.size() == 0) {
|
if (keys.size() == 0) {
|
||||||
return new EmptyKeySet<T>(pClass);
|
return new EmptyKeySet<T>(pClass);
|
||||||
} else {
|
} else {
|
||||||
Comparable<?> first = keys.iterator().next();
|
Comparable<?>[] keyArray = new Comparable<?>[keys.size()];
|
||||||
Comparable<?>[] keyArray;
|
|
||||||
if (first instanceof Integer) {
|
|
||||||
keyArray = new Integer[keys.size()];
|
|
||||||
} else if (first instanceof String) {
|
|
||||||
keyArray = new String[keys.size()];
|
|
||||||
} else {
|
|
||||||
keyArray = new Comparable<?>[keys.size()];
|
|
||||||
}
|
|
||||||
return new SingleKeySet<T>(pClass, keys.toArray(keyArray));
|
return new SingleKeySet<T>(pClass, keys.toArray(keyArray));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user