You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2021/06/22 16:05:13 UTC
[sling-org-apache-sling-feature-analyser] branch master updated:
SLING-10512 : Analysers should not fail if no scanner is found
This is an automated email from the ASF dual-hosted git repository.
cziegeler 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 e4fe2a6 SLING-10512 : Analysers should not fail if no scanner is found
e4fe2a6 is described below
commit e4fe2a6e2eb871d5518a2c17b6617a7422b83d6c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jun 22 18:05:03 2021 +0200
SLING-10512 : Analysers should not fail if no scanner is found
---
.../org/apache/sling/feature/scanner/Scanner.java | 25 ++++++++++++----------
1 file changed, 14 insertions(+), 11 deletions(-)
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 877ce92..3d70a4e 100644
--- a/src/main/java/org/apache/sling/feature/scanner/Scanner.java
+++ b/src/main/java/org/apache/sling/feature/scanner/Scanner.java
@@ -18,7 +18,11 @@ package org.apache.sling.feature.scanner;
import java.io.IOException;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.ServiceLoader;
+import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.jar.Manifest;
import java.util.stream.Collectors;
@@ -184,17 +188,16 @@ public class Scanner {
break;
}
}
- if ( extDesc == null ) {
- throw new IOException("No extension scanner found for extension named " + ext.getName() + " of type " + ext.getType().name());
- }
- desc.getRequirements().addAll(extDesc.getRequirements());
- desc.getCapabilities().addAll(extDesc.getCapabilities());
- desc.getExportedPackages().addAll(extDesc.getExportedPackages());
- desc.getImportedPackages().addAll(extDesc.getImportedPackages());
- desc.getDynamicImportedPackages().addAll(extDesc.getDynamicImportedPackages());
+ if ( extDesc != null ) {
+ desc.getRequirements().addAll(extDesc.getRequirements());
+ desc.getCapabilities().addAll(extDesc.getCapabilities());
+ desc.getExportedPackages().addAll(extDesc.getExportedPackages());
+ desc.getImportedPackages().addAll(extDesc.getImportedPackages());
+ desc.getDynamicImportedPackages().addAll(extDesc.getDynamicImportedPackages());
- desc.getArtifactDescriptors().addAll(extDesc.getArtifactDescriptors());
- desc.getBundleDescriptors().addAll(extDesc.getBundleDescriptors());
+ desc.getArtifactDescriptors().addAll(extDesc.getArtifactDescriptors());
+ desc.getBundleDescriptors().addAll(extDesc.getBundleDescriptors());
+ }
}
}