Workarround concurrent modification issue

Author: xdegenne

elasticsearch-annotations/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alien4cloud</groupId>
         <artifactId>elasticsearch-mapping-parent</artifactId>
-        <version>1.7.6-SNAPSHOT</version>
+        <version>1.7.6</version>
     </parent>
 
     <artifactId>elasticsearch-annotations</artifactId>
@@ -18,4 +18,4 @@
             <artifactId>elasticsearch</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>

elasticsearch-mapping/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alien4cloud</groupId>
         <artifactId>elasticsearch-mapping-parent</artifactId>
-        <version>1.7.6-SNAPSHOT</version>
+        <version>1.7.6</version>
     </parent>
 
     <artifactId>elasticsearch-mapping</artifactId>
@@ -41,4 +41,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>

elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/QueryHelper.java

@@ -592,7 +592,10 @@ private List<AggregationBuilder> buildAggregations(String className, Set<String>
                 return aggregationBuilders;
             }
 
-            for (IFacetBuilderHelper facetBuilderHelper : facetBuilderHelpers) {
+            // FIXME: concurrent modifications here, to instruct
+            IFacetBuilderHelper[] IFacetBuilderHelpers = new IFacetBuilderHelper[facetBuilderHelpers.size()];
+            facetBuilderHelpers.toArray(IFacetBuilderHelpers);
+            for (IFacetBuilderHelper facetBuilderHelper : IFacetBuilderHelpers) {
                 if (filters == null || !filters.contains(facetBuilderHelper.getEsFieldName())) {
                     aggregationBuilders.addAll(facetBuilderHelper.buildFacets());
                 }

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.alien4cloud</groupId>
     <artifactId>elasticsearch-mapping-parent</artifactId>
-    <version>1.7.6-SNAPSHOT</version>
+    <version>1.7.6</version>
     <packaging>pom</packaging>
 
     <name>Elastic search mapping parent</name>