Bug fix: NPE when adding event count in ParamMapBucket (#494)

Signed-off-by: Eric Zhao <sczyh16@gmail.com>
alibaba · Feb 20, 2019 · 020a63f · 020a63f
1 parent ee4a0d4
commit 020a63f
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/...w-control/src/main/java/com/alibaba/csp/sentinel/slots/statistic/data/ParamMapBucket.java b/...w-control/src/main/java/com/alibaba/csp/sentinel/slots/statistic/data/ParamMapBucket.java
@@ -59,9 +59,16 @@ public int get(RollingParamEvent event, Object value) {
     }
 
     public ParamMapBucket add(RollingParamEvent event, int count, Object value) {
-        data[event.ordinal()].putIfAbsent(value, new AtomicInteger());
         AtomicInteger counter = data[event.ordinal()].get(value);
-        counter.addAndGet(count);
+        // Note: not strictly concise.
+        if (counter == null) {
+            AtomicInteger old = data[event.ordinal()].putIfAbsent(value, new AtomicInteger(count));
+            if (old != null) {
+                old.addAndGet(count);
+            }
+        } else {
+            counter.addAndGet(count);
+        }
         return this;
     }
 
@@ -74,4 +81,4 @@ public Set<Object> descendingKeySet(RollingParamEvent type) {
     }
 
     public static final int DEFAULT_MAX_CAPACITY = 200;
-}
+}