[sling-org-apache-sling-launchpad-installer] 14/16: SLING-4079 - ignore non-installable resources, based on a contribution by Radu Cotescu, thanks!

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.launchpad.installer-1.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git

commit eb260a129d6830ea253f089c0b15fec6d7471ab2
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Oct 21 09:35:46 2014 +0000

    SLING-4079 - ignore non-installable resources, based on a contribution by Radu Cotescu, thanks!
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1633329 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sling/launchpad/installer/impl/LaunchpadConfigInstaller.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
index 382a66f..033b698 100644
--- a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
+++ b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
@@ -90,7 +90,8 @@ public class LaunchpadConfigInstaller {
 
                     final URL url = resourceProvider.getResource(path);
                     if(url == null){
-                    	throw new RuntimeException("Retrieved null resource for path: "+path);
+                        logger.debug("Launchpad ignoring path '{}' due to null URL", path);
+                        continue;
                     }
                     Dictionary<String, Object> dict = null;
                     if ( InstallableResource.TYPE_FILE.equals(resourceType) ) {
@@ -206,4 +207,4 @@ public class LaunchpadConfigInstaller {
         installer.registerResources("launchpad", (toInstall));
         logger.info("{} resources registered with OsgiInstaller", toInstall.length);
     }
-}
\ No newline at end of file
+}

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.