svn commit: r1086022 - /incubator/clerezza/trunk/parent/tools.offline/src/main/java/org/apache/clerezza/tools/offline/ZipCreationUtil.java

[reto]

Author: reto
Date: Sun Mar 27 20:20:42 2011
New Revision: 1086022

URL: http://svn.apache.org/viewvc?rev=1086022&view=rev
Log:
CLEREZZA-478:working around the possibility of duplicate lement in current 
wymiwyg-commons-version

Modified:
    
incubator/clerezza/trunk/parent/tools.offline/src/main/java/org/apache/clerezza/tools/offline/ZipCreationUtil.java

Modified: 
incubator/clerezza/trunk/parent/tools.offline/src/main/java/org/apache/clerezza/tools/offline/ZipCreationUtil.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/tools.offline/src/main/java/org/apache/clerezza/tools/offline/ZipCreationUtil.java?rev=1086022&r1=1086021&r2=1086022&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/parent/tools.offline/src/main/java/org/apache/clerezza/tools/offline/ZipCreationUtil.java
 (original)
+++ 
incubator/clerezza/trunk/parent/tools.offline/src/main/java/org/apache/clerezza/tools/offline/ZipCreationUtil.java
 Sun Mar 27 20:20:42 2011
@@ -21,6 +21,9 @@ package org.apache.clerezza.tools.offlin
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 import org.wymiwyg.commons.util.dirbrowser.PathNode;
@@ -41,7 +44,9 @@ class ZipCreationUtil {
        private static void archive(ZipOutputStream compressedTcs,
                        PathNode pathNode) throws IOException {
                if (pathNode.isDirectory()) {
-                       String[] childNames = pathNode.list();
+                       //multi-path node doesn't prevent duplicate in versions 
previous to
+                       //0.8
+                       Set<String> childNames = new 
HashSet<String>(Arrays.asList(pathNode.list()));
                        for (String childName : childNames) {
                                archive(compressedTcs, 
pathNode.getSubPath(childName));
                        }