Fixing minor merge conflict, which was causing compilation error

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1003859 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 1 deletions

diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/DirectoryContributionScanner.java b/sca-java-2.x/branches/sca-java-2.0-M5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/DirectoryContributionScanner.java
index 3867f8c333..04334492d1 100644
--- a/sca-java-2.x/branches/sca-java-2.0-M5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/DirectoryContributionScanner.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/DirectoryContributionScanner.java
@@ -26,6 +26,7 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.AccessControlException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
@@ -89,8 +90,10 @@ public class DirectoryContributionScanner implements ContributionScanner {
     private List<String> scanContributionArtifacts(Contribution contribution) throws ContributionReadException {
         File directory = directory(contribution);
         List<String> artifacts = new ArrayList<String>();
+        // [rfeng] There are cases that the folder contains symbolic links that point to the same physical directory
+        Set<File> visited = new HashSet<File>();
         try {
-            traverse(artifacts, directory, directory);
+            traverse(artifacts, directory, directory, visited);
         } catch (IOException e) {
             throw new ContributionReadException(e);
         }