You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2020/10/13 12:04:04 UTC
[sling-org-apache-sling-feature-analyser] branch master updated:
SLING-8481: assume resolving the bundle artifact file is optional if
metadata is present.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git
The following commit(s) were added to refs/heads/master by this push:
new 121d387 SLING-8481: assume resolving the bundle artifact file is optional if metadata is present.
121d387 is described below
commit 121d387c699742b37290d3d66d986150edb0acf6
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Tue Oct 13 14:03:48 2020 +0200
SLING-8481: assume resolving the bundle artifact file is optional if metadata is present.
---
src/main/java/org/apache/sling/feature/scanner/Scanner.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/feature/scanner/Scanner.java b/src/main/java/org/apache/sling/feature/scanner/Scanner.java
index 3fd2fe8..81d5350 100644
--- a/src/main/java/org/apache/sling/feature/scanner/Scanner.java
+++ b/src/main/java/org/apache/sling/feature/scanner/Scanner.java
@@ -253,7 +253,13 @@ public class Scanner {
if (this.cache.get(key) == null) {
JsonObject headers = entry.getValue().asJsonObject();
if (headers.containsKey("manifest")) {
- final URL file = artifactProvider.provide(id);
+ URL file;
+ try {
+ file = artifactProvider.provide(id);
+ } catch (Exception ex) {
+ // Ignore, as we have the metadata cached we assume getting the file is a best effort.
+ file = null;
+ }
Manifest manifest = new Manifest();
JsonObject manifestHeaders = headers.getJsonObject("manifest");
for (String name : manifestHeaders.keySet()) {