commit 42214ffa505674303cb37739cda18cd4e544b66e
author Carsten Ziegeler <cziegeler@apache.org> Mon Jan 31 13:12:07 2011 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Mon Jan 31 13:12:07 2011 +0000
tree 492b50333586037aea103b2297c77879b39f69d7
parent 32441d0f31c3dcf268b55a9367a017a402aa6f64

Add extra null checks 

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1065593 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java

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 c2f6435..1455d1d 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
@@ -53,20 +53,24 @@
 
         // configurations
         final Iterator<String> configPaths = resourceProvider.getChildren(ROOT_CONFIG_PATH);
-        while (configPaths.hasNext()) {
-            final String path = configPaths.next();
-            logger.info("Config launchpad file will be installed: {}", path);
-            final InputStream stream = resourceProvider.getResourceAsStream(path);
-            installables.add(new InstallableResource(path, stream, null, null, InstallableResource.TYPE_PROPERTIES, null));
+        if ( configPaths != null ) {
+            while (configPaths.hasNext()) {
+                final String path = configPaths.next();
+                logger.info("Config launchpad file will be installed: {}", path);
+                final InputStream stream = resourceProvider.getResourceAsStream(path);
+                installables.add(new InstallableResource(path, stream, null, null, InstallableResource.TYPE_PROPERTIES, null));
+            }
         }
 
         // files
         final Iterator<String> filePaths = resourceProvider.getChildren(ROOT_INSTALL_PATH);
-        while (filePaths.hasNext()) {
-            final String path = filePaths.next();
-            logger.info("Launchpad file will be installed: {}", path);
-            final InputStream stream = resourceProvider.getResourceAsStream(path);
-            installables.add(new InstallableResource(path, stream, null, null, InstallableResource.TYPE_FILE, null));
+        if ( filePaths != null ) {
+            while (filePaths.hasNext()) {
+                final String path = filePaths.next();
+                logger.info("Launchpad file will be installed: {}", path);
+                final InputStream stream = resourceProvider.getResourceAsStream(path);
+                installables.add(new InstallableResource(path, stream, null, null, InstallableResource.TYPE_FILE, null));
+            }
         }
 
         final InstallableResource [] toInstall = installables.toArray(new InstallableResource []{});