svn commit: r1403726 - /camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java

[da...@apache.org]

Author: davsclaus
Date: Tue Oct 30 14:54:53 2012
New Revision: 1403726

URL: http://svn.apache.org/viewvc?rev=1403726&view=rev
Log:
CAMEL-5741: Fixed camel-cdi adding duplicate RouteBuilder in internal list of discovered RouteBuilders.

Modified:
    camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java

Modified: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java?rev=1403726&r1=1403725&r2=1403726&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java Tue Oct 30 14:54:53 2012
@@ -17,10 +17,8 @@
 package org.apache.camel.cdi.internal;
 
 import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.LinkedHashSet;
 import java.util.Set;
-
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
@@ -36,8 +34,9 @@ import org.apache.camel.util.ObjectHelpe
  * Configuration options to be applied to a {@link org.apache.camel.CamelContext} by a {@link CamelContextBean}
  */
 public class CamelContextConfig {
-    private final List<Bean<?>> routeBuilderBeans = new ArrayList<Bean<?>>();
-    private final List<ProcessAnnotatedType<?>> patRouteBuilders = new ArrayList<ProcessAnnotatedType<?>>();
+    // use a set to avoid duplicates
+    private final Set<Bean<?>> routeBuilderBeans = new LinkedHashSet<Bean<?>>();
+    private final Set<ProcessAnnotatedType<?>> patRouteBuilders = new LinkedHashSet<ProcessAnnotatedType<?>>();
 
     public void addRouteBuilderBean(Bean<?> bean) {
         routeBuilderBeans.add(bean);