demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 21:31:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

AddonInfoAddonsXmlProvider check for missing folder (#3903)

Browse Source 
* [AddonInfoAddonsXmlProvider] fix issue #3901

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
This commit is contained in:
Andrew Fiddian-Green 2023-12-07 13:30:10 +00:00 committed by GitHub
parent 44b92dbc59
commit de9912d06b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bundles/org.openhab.core.addon/src/main/java/org/openhab/core/addon/internal/xml/AddonInfoAddonsXmlProvider.java
View File

@ -79,8 +79,18 @@ public class AddonInfoAddonsXmlProvider implements AddonInfoProvider {
} }
private void initialize() { private void initialize() {
File fileFolder = new File(folder);
try {
if (!fileFolder.isDirectory()) {
logger.debug("Folder '{}' does not exist", folder);
return;
}
} catch (SecurityException e) {
logger.warn("Folder '{}' threw a security exception: {}", folder, e.getMessage());
return;
}
AddonInfoListReader reader = new AddonInfoListReader(); AddonInfoListReader reader = new AddonInfoListReader();
Stream.of(new File(folder).listFiles()).filter(f -> f.isFile() && f.getName().endsWith(".xml")).forEach(f -> { Stream.of(fileFolder.listFiles()).filter(f -> f.isFile() && f.getName().endsWith(".xml")).forEach(f -> {
try { try {
String xml = Files.readString(f.toPath()); String xml = Files.readString(f.toPath());
if (xml != null && !xml.isBlank()) { if (xml != null && !xml.isBlank()) {
@ -94,6 +104,8 @@ public class AddonInfoAddonsXmlProvider implements AddonInfoProvider {
logger.warn("File '{}' has invalid content", f.getName()); logger.warn("File '{}' has invalid content", f.getName());
} catch (XStreamException e) { } catch (XStreamException e) {
logger.warn("File '{}' could not be deserialized", f.getName()); logger.warn("File '{}' could not be deserialized", f.getName());
} catch (SecurityException e) {
logger.warn("File '{}' threw a security exception: {}", folder, e.getMessage());
} }
}); });
} }