From 4fcec92f1aa84346b73133b03984ebe33d138c9b Mon Sep 17 00:00:00 2001
From: Mark Spruiell <mes@zeroc.com>
Date: Fri, 14 May 2010 19:49:18 -0700
Subject: bug 4749 - duplicate Slice files cause slice2java to fail

---
 java/src/ant/Slice2JavaTask.java | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'java/src/ant/Slice2JavaTask.java')

diff --git a/java/src/ant/Slice2JavaTask.java b/java/src/ant/Slice2JavaTask.java
index 7cd79c63d3d..b71750599d2 100644
--- a/java/src/ant/Slice2JavaTask.java
+++ b/java/src/ant/Slice2JavaTask.java
@@ -117,8 +117,8 @@ public class Slice2JavaTask extends SliceTask
         // anymore (the slice file changed since the dependency was
         // last updated or a slice file it depends on changed).
         //
-        java.util.ArrayList<File> buildList = new java.util.ArrayList<File>();
-        java.util.ArrayList<File> skipList = new java.util.ArrayList<File>();
+        java.util.HashSet<File> buildList = new java.util.HashSet<File>();
+        java.util.HashSet<File> skipList = new java.util.HashSet<File>();
         for(FileSet fileset : _fileSets)
         {
             DirectoryScanner scanner = fileset.getDirectoryScanner(getProject());
@@ -138,20 +138,20 @@ public class Slice2JavaTask extends SliceTask
                     skipList.add(slice);
                 }
             }
+        }
 
-            if(_checksum != null && _checksum.length() > 0 && !buildList.isEmpty())
-            {
-                //
-                // Recompile all Slice files when checksums are used.
-                //
-                buildList.addAll(skipList);
-            }
-            else 
+        if(_checksum != null && _checksum.length() > 0 && !buildList.isEmpty())
+        {
+            //
+            // Recompile all Slice files when checksums are used.
+            //
+            buildList.addAll(skipList);
+        }
+        else
+        {
+            for(File file : skipList)
             {
-                for(File file : skipList)
-                {
-                    log("skipping " + file.getName());
-                }
+                log("skipping " + file.getName());
             }
         }
 
-- 
cgit v1.2.3