Revision a8905c60
Added by Katja Luther over 7 years ago
| cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java | ||
|---|---|---|
| 282 | 282 |
// see FIXME in 'prepareQuery' for more details |
| 283 | 283 |
if (doTaxa && doSynonyms){
|
| 284 | 284 |
if (result[3].equals("synonym")) {
|
| 285 |
resultObjects.add( new UuidAndTitleCache(Synonym.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString()))); |
|
| 285 |
resultObjects.add( new UuidAndTitleCache(Synonym.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString()), null));
|
|
| 286 | 286 |
} |
| 287 | 287 |
else {
|
| 288 |
resultObjects.add( new UuidAndTitleCache(Taxon.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString()))); |
|
| 288 |
resultObjects.add( new UuidAndTitleCache(Taxon.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString()), null));
|
|
| 289 | 289 |
} |
| 290 | 290 |
}else if (doTaxa){
|
| 291 |
resultObjects.add( new UuidAndTitleCache(Taxon.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString()))); |
|
| 291 |
resultObjects.add( new UuidAndTitleCache(Taxon.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString()), null));
|
|
| 292 | 292 |
}else if (doSynonyms){
|
| 293 |
resultObjects.add( new UuidAndTitleCache(Synonym.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString()))); |
|
| 293 |
resultObjects.add( new UuidAndTitleCache(Synonym.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString()), null));
|
|
| 294 | 294 |
} |
| 295 | 295 |
} |
| 296 | 296 |
|
| ... | ... | |
| 2140 | 2140 |
Object[] result; |
| 2141 | 2141 |
for(int i = 0; i<resultArray.size();i++){
|
| 2142 | 2142 |
result = (Object[]) resultArray.get(i); |
| 2143 |
returnResult.add(new UuidAndTitleCache(Taxon.class, (UUID) result[0],(Integer)result[1], (String)result[2], new Boolean(result[4].toString()))); |
|
| 2143 |
returnResult.add(new UuidAndTitleCache(Taxon.class, (UUID) result[0],(Integer)result[1], (String)result[2], new Boolean(result[4].toString()), null));
|
|
| 2144 | 2144 |
} |
| 2145 | 2145 |
return returnResult; |
| 2146 | 2146 |
} |
Also available in: Unified diff
fix #5828: add abbrevTitleCache and titleCache to uuidAndTitleCache