statool/statoolinfos
statool/statoolinfos
1
0
Fork 0
Code Issues Pull requests Releases 8 Activity

Fixed service not found in cache.

Browse source
This commit is contained in:
Christian P. MOMON 2020-12-10 00:17:28 +01:00
parent 481dfce2d5
commit 5ca7f96371
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/fr/devinsy/statoolinfos/core/Factory.java
View file

@ -259,9 +259,12 @@ public class Factory
{ {
URL serviceInputURL = new URL(property.getValue()); URL serviceInputURL = new URL(property.getValue());
Service service = loadService(serviceInputURL, cache); Service service = loadService(serviceInputURL, cache);
service.setOrganization(result); if (service != null)
service.setLogoFileName(result.getTechnicalName() + "-" + service.getLogoFileName()); {
result.getServices().add(service); service.setOrganization(result);
service.setLogoFileName(result.getTechnicalName() + "-" + service.getLogoFileName());
result.getServices().add(service);
}
} }
} }
} }
@ -282,11 +285,19 @@ public class Factory
File inputFile = cache.restoreFile(inputURL); File inputFile = cache.restoreFile(inputURL);
PathProperties properties = PathPropertyUtils.load(inputFile); if (inputFile == null)
result = new Service(properties); {
result.setInputFile(inputFile); logger.warn("WARNING: service not found in cache [{}]", inputURL);
result.setInputURL(inputURL); result = null;
result.setLogoFileName(result.getTechnicalName() + "-logo" + StringUtils.defaultIfBlank(cache.getExtension(result.getLogoURL()), ".png")); }
else
{
PathProperties properties = PathPropertyUtils.load(inputFile);
result = new Service(properties);
result.setInputFile(inputFile);
result.setInputURL(inputURL);
result.setLogoFileName(result.getTechnicalName() + "-logo" + StringUtils.defaultIfBlank(cache.getExtension(result.getLogoURL()), ".png"));
}
// //
return result; return result;