Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

This NPE needs better fix

Browse source
This commit is contained in:
sonora 2015-01-14 23:03:28 +01:00
parent fef1c68ff1
commit 8e4b3b5693
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
OsmAnd/src/net/osmand/plus/resources/RegionAddressRepositoryBinary.java
View file

@ -129,17 +129,15 @@ public class RegionAddressRepositoryBinary implements RegionAddressRepository {
@Override
public synchronized void preloadStreets(City o, ResultMatcher<Street> resultMatcher) {
//Looks like o can be null here, question is why
if (o!=null) {
Collection<Street> streets = o.getStreets();
if(!streets.isEmpty()){
return;
}
try {
file.preloadStreets(o, BinaryMapIndexReader.buildAddressRequest(resultMatcher));
} catch (IOException e) {
log.error("Disk operation failed" , e); //$NON-NLS-1$
}
//TODO: Check NPE, looks like o can be null here, question is why
Collection<Street> streets = o.getStreets();
if(!streets.isEmpty()){
return;
}
try {
file.preloadStreets(o, BinaryMapIndexReader.buildAddressRequest(resultMatcher));
} catch (IOException e) {
log.error("Disk operation failed" , e); //$NON-NLS-1$
}
}