summaryrefslogtreecommitdiffstats
path: root/simplemetrics/src/main/java/com
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2016-11-08 11:15:55 +0100
committerArne H Juul <arnej@yahoo-inc.com>2016-11-08 11:15:55 +0100
commit2dc510cbe94cf8e38049d0fdaea668a2c8e5e615 (patch)
tree72be1ea2e3ca06c999c1f03a81032fd9d4b448c9 /simplemetrics/src/main/java/com
parent34ae85006db23a313150838b94b175c0fcc32f45 (diff)
add unit test exposing bug in conversion, and a minimal fix
Diffstat (limited to 'simplemetrics/src/main/java/com')
-rw-r--r--simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/SnapshotConverter.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/SnapshotConverter.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/SnapshotConverter.java
index 83b84abaded..bb0989ae127 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/SnapshotConverter.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/SnapshotConverter.java
@@ -94,6 +94,9 @@ class SnapshotConverter {
}
private Map<String, MetricValue> getMap(Point point) {
+ if (point == null) {
+ point = new Point(new HashMap<>());
+ }
if (! perPointData.containsKey(point)) {
perPointData.put(point, new HashMap<>());
}