Merge branch 'release/2.1.4'

Author: Andrew Clegg

CHANGELOG.md

@@ -1,6 +1,11 @@
 Release 2.1.3
 -------------
 
+Fixed a race condition in BytesRefUtils.
+
+Release 2.1.3
+-------------
+
 Better checking for incorrect usage of distinct count payloads, and terminology improvements.
 
 Added "sample" parameter for term list facet's equivalent of approximate mode.

README.md

@@ -17,7 +17,7 @@ Plugin < 1.3.0: ElasticSearch 0.19.X, tested on 0.19.11
 
 Plugin 1.3.X: ElasticSearch 0.20.X, tested on 0.20.6
 
-Plugin 2.1.3: ElasticSearch 0.90.2, plus significant feature and performance improvements, and breaking API changes
+Plugin 2.1.4: ElasticSearch 0.90.2, plus significant feature and performance improvements, and breaking API changes
 
 ElasticSearch 0.90.3 is not supported yet.
 

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.pearson.entech</groupId>
 	<artifactId>elasticsearch-approx-plugin</artifactId>
-	<version>2.1.3</version>
+	<version>2.1.4</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

src/main/java/com/pearson/entech/elasticsearch/plugin/approx/BytesRefUtils.java

@@ -17,7 +17,7 @@
 public class BytesRefUtils {
 
     /** The compact() method on BytesRefHash objects. */
-    private static Method __compact;
+    private static volatile Method __compact;
 
     /** An empty array of objects: the params required for reflective-invocation of __compact. */
     private static final Object[] __emptyParams = {};
@@ -45,15 +45,16 @@ public static interface Procedure {
     private static Method getCompactMethod() {
         if(__compact != null)
             return __compact;
+        Method compact;
         try {
-            __compact = BytesRefHash.class.getDeclaredMethod("compact", new Class[0]);
+            compact = BytesRefHash.class.getDeclaredMethod("compact", new Class[0]);
         } catch(final SecurityException e) {
             throw new RuntimeException(e);
         } catch(final NoSuchMethodException e) {
             throw new RuntimeException(e);
         }
-        __compact.setAccessible(true);
-        return __compact;
+        compact.setAccessible(true);
+        return __compact = compact;
     }
 
     /**