fix issue: There is a thread safety issue with InfluxDBResultMapper i…

…nfluxdata#683 (influxdata#685) Co-authored-by: mayuefeng <[email protected]>
BrentonPoke · Jul 20, 2020 · 93c0093 · 93c0093
1 parent f590c59
commit 93c0093
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/main/java/org/influxdb/impl/InfluxDBResultMapper.java b/src/main/java/org/influxdb/impl/InfluxDBResultMapper.java
@@ -211,11 +211,7 @@ void cacheMeasurementClass(final Class<?>... classVarAgrs) {
       if (CLASS_FIELD_CACHE.containsKey(clazz.getName())) {
         continue;
       }
-      ConcurrentMap<String, Field> initialMap = new ConcurrentHashMap<>();
-      ConcurrentMap<String, Field> influxColumnAndFieldMap = CLASS_FIELD_CACHE.putIfAbsent(clazz.getName(), initialMap);
-      if (influxColumnAndFieldMap == null) {
-        influxColumnAndFieldMap = initialMap;
-      }
+      ConcurrentMap<String, Field> influxColumnAndFieldMap = new ConcurrentHashMap<>();
 
       Class<?> c = clazz;
       while (c != null) {
@@ -227,6 +223,7 @@ void cacheMeasurementClass(final Class<?>... classVarAgrs) {
         }
         c = c.getSuperclass();
       }
+      CLASS_FIELD_CACHE.putIfAbsent(clazz.getName(), influxColumnAndFieldMap);
     }
   }