commit e4fe2a6e2eb871d5518a2c17b6617a7422b83d6c
author Carsten Ziegeler <cziegeler@apache.org> Tue Jun 22 18:05:03 2021 +0200
committer Carsten Ziegeler <cziegeler@apache.org> Tue Jun 22 18:05:03 2021 +0200
tree d36ba6cb110dda61eacc33583b71b1ec83649ec2
parent a5fe8cb8b73f226c32819fc0dd5c7c253a4f141d

SLING-10512 : Analysers should not fail if no scanner is found

src/main/java/org/apache/sling/feature/scanner/Scanner.java

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 @@
 
 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 @@
                     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());
+            }
         }
     }