Minor fix

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1106 b35dd754-fafc-0310-a699-88a17e54d16e

Minor fix
git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1106 b35dd754-fafc-0310-a699-88a17e54d16e
3450e84f · Bill Lynch · bill · ab2a5765 · 3450e84f · 3450e84f
Commit 3450e84f authored Mar 08, 2005 by Bill Lynch Committed by bill Mar 08, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 13 deletions

ant-subdirtask.jar build/lib/ant-subdirtask.jar +0 -0

SubDirInfoTask.java src/tools/anttask/org/jivesoftware/ant/SubDirInfoTask.java +15 -13

No files found.
--- a/build/lib/ant-subdirtask.jar
+++ b/build/lib/ant-subdirtask.jar
--- a/src/tools/anttask/org/jivesoftware/ant/SubDirInfoTask.java
+++ b/src/tools/anttask/org/jivesoftware/ant/SubDirInfoTask.java
@@ -84,24 +84,26 @@ public class SubDirInfoTask extends Task {
        StringBuffer buf = new StringBuffer();
        String value = null;
        String sep = "";
-        for (int i=0; i<subdirs.length; i++) {
+        if (subdirs != null) {
-            File subdir = subdirs[i];
+            for (int i=0; i<subdirs.length; i++) {
-            boolean add = false;
+                File subdir = subdirs[i];
-            if (subdir.isDirectory()) {
+                boolean add = false;
-                if (getIfexists() != null) {
+                if (subdir.isDirectory()) {
-                    File file = new File(subdir, getIfexists());
+                    if (getIfexists() != null) {
-                    if (file.exists()) {
+                        File file = new File(subdir, getIfexists());
+                        if (file.exists()) {
+                            add = true;
+                        }
+                    }
+                    else {
                        add = true;
                    }
                }
-                else {
+                if (add && !subdir.getName().equals(except)) {
-                    add = true;
+                    buf.append(sep).append(subdir.getName());
+                    sep = getDelimiter();
                }
            }
-            if (add && !subdir.getName().equals(except)) {
-                buf.append(sep).append(subdir.getName());
-                sep = getDelimiter();
-            }
        }
        if (buf.length() > 0) {
            value = buf.toString();