You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/10/13 14:56:49 UTC

svn commit: r1182820 - /karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java

Author: iocanel
Date: Thu Oct 13 12:56:49 2011
New Revision: 1182820

URL: http://svn.apache.org/viewvc?rev=1182820&view=rev
Log:
[KARAF-937] Added a check for duplicate entries in the features configuration generated by karaf-maven-plugin.

Modified:
    karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java

Modified: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java?rev=1182820&r1=1182819&r2=1182820&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java Thu Oct 13 12:56:49 2011
@@ -350,8 +350,10 @@ public class InstallKarsMojo extends Moj
                         in.close();
                     }
                     String existingFeatureRepos = properties.containsKey(FEATURES_REPOSITORIES) && !((String) properties.get(FEATURES_REPOSITORIES)).isEmpty()? properties.get(FEATURES_REPOSITORIES) + ",": "";
-                    existingFeatureRepos = existingFeatureRepos + uri.toString();
-                    properties.put(FEATURES_REPOSITORIES, existingFeatureRepos);
+                    if(!existingFeatureRepos.contains(uri.toString())) {
+                       existingFeatureRepos = existingFeatureRepos + uri.toString();
+                       properties.put(FEATURES_REPOSITORIES, existingFeatureRepos);
+                    }
                     Features repo = readFeatures(uri);
                     for (Feature feature: repo.getFeature()) {
                         if (startupFeatures != null && startupFeatures.contains(feature.getName())) {
@@ -359,8 +361,10 @@ public class InstallKarsMojo extends Moj
                         } else if (bootFeatures != null && bootFeatures.contains(feature.getName())) {
                             localRepoFeatures.add(feature);
                             String existingBootFeatures = properties.containsKey(FEATURES_BOOT) && !((String) properties.get(FEATURES_BOOT)).isEmpty()? properties.get(FEATURES_BOOT) + ",": "";
-                            existingBootFeatures = existingBootFeatures + feature.getName();
-                            properties.put(FEATURES_BOOT, existingBootFeatures);
+                            if(!existingBootFeatures.contains(feature.getName())) {
+                                existingBootFeatures = existingBootFeatures + feature.getName();
+                                properties.put(FEATURES_BOOT, existingBootFeatures);
+                            }
                         }  else if (installedFeatures != null && installedFeatures.contains(feature.getName())) {
                             localRepoFeatures.add(feature);
                         }