CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-06-30 21:08:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed null handling

Browse Source
This commit is contained in:
Timo Westkämper 2011-07-07 06:32:33 +00:00
parent 3f5d3396ec
commit 284646d923
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java
View File

@ -181,10 +181,14 @@ public abstract class AbstractJPAQuery<Q extends AbstractJPAQuery<Q>> extends JP
List<Object> rv = new ArrayList<Object>(results.size());
FactoryExpression<?> expr = (FactoryExpression<?>)getMetadata().getProjection().get(0);
for (Object o : results) {
if (o != null && !o.getClass().isArray()){
o = new Object[]{o};
}
rv.add(expr.newInstance((Object[])o));
if (o != null) {
if (!o.getClass().isArray()){
o = new Object[]{o};
}
rv.add(expr.newInstance((Object[])o));
} else {
rv.add(null);
}
}
return rv;
} else {
@ -202,10 +206,14 @@ public abstract class AbstractJPAQuery<Q extends AbstractJPAQuery<Q>> extends JP
if (factoryExpressionUsed) {
Object result = query.getSingleResult();
FactoryExpression<?> expr = (FactoryExpression<?>)getMetadata().getProjection().get(0);
if (result != null && !result.getClass().isArray()) {
result = new Object[]{result};
}
return expr.newInstance((Object[])result);
if (result != null) {
if (!result.getClass().isArray()) {
result = new Object[]{result};
}
return expr.newInstance((Object[])result);
} else {
return null;
}
} else {
return query.getSingleResult();
}