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

extend NPE fix

Browse source
This commit is contained in:
sonora 2015-01-14 22:44:22 +01:00
parent 3cda17468b
commit fef1c68ff1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -129,18 +129,18 @@ public class RegionAddressRepositoryBinary implements RegionAddressRepository {
@Override @Override
public synchronized void preloadStreets(City o, ResultMatcher<Street> resultMatcher) { public synchronized void preloadStreets(City o, ResultMatcher<Street> resultMatcher) {
//Looks like o can be null here, question is why
if (o!=null) { if (o!=null) {
Collection<Street> streets = o.getStreets(); Collection<Street> streets = o.getStreets();
if(!streets.isEmpty()){ if(!streets.isEmpty()){
return; return;
} }
try {
file.preloadStreets(o, BinaryMapIndexReader.buildAddressRequest(resultMatcher));
} catch (IOException e) {
log.error("Disk operation failed" , e); //$NON-NLS-1$
}
} }
try {
file.preloadStreets(o, BinaryMapIndexReader.buildAddressRequest(resultMatcher));
} catch (IOException e) {
log.error("Disk operation failed" , e); //$NON-NLS-1$
}
} }
// // not use ccontains It is really slow, takes about 10 times more than other steps // // not use ccontains It is really slow, takes about 10 times more than other steps