[Aplaws-commit] r1096 - in trunk/ccm-ldn-theme: . src/com/arsdigita/london/theme/util

[<ssk...@vh...>]

Author: sskracic
Date: 2006-02-24 18:59:15 +0100 (Fri, 24 Feb 2006)
New Revision: 1096

Modified:
   trunk/ccm-ldn-theme/application.xml
   trunk/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeFileUtil.java
Log:
  In empty directory, listfiles() will return null instead of empty list.


Modified: trunk/ccm-ldn-theme/application.xml
===================================================================
--- trunk/ccm-ldn-theme/application.xml	2006-02-24 14:17:45 UTC (rev 1095)
+++ trunk/ccm-ldn-theme/application.xml	2006-02-24 17:59:15 UTC (rev 1096)
@@ -3,7 +3,7 @@
   name="ccm-ldn-theme"
   prettyName="Theme"
   version="6.3.1"
-  release="2">
+  release="3">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-subsite" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeFileUtil.java
===================================================================
--- trunk/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeFileUtil.java	2006-02-24 14:17:45 UTC (rev 1095)
+++ trunk/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeFileUtil.java	2006-02-24 17:59:15 UTC (rev 1096)
@@ -119,10 +119,12 @@
                                             String fileType) {
         if (currentFile.isDirectory()) {
             File[] files = currentFile.listFiles(new WhiteListFilenameFilter());
-            for (int i = 0; i < files.length; i++) {
-                updateDatabaseFiles(files[i], currentTheme,
-                                    serverSpecificPath, themeFiles,
-                                    overwriteNewerFiles, fileType);
+            if (files != null) {
+                for (int i = 0; i < files.length; i++) {
+                    updateDatabaseFiles(files[i], currentTheme,
+                                        serverSpecificPath, themeFiles,
+                                        overwriteNewerFiles, fileType);
+                }
             }
         } else {
             if (currentFile.exists()) {