Treat empty and null properties the same way.

2 files changed, 3 insertions, 9 deletions

diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/PointBuilder.java b/container-core/src/main/java/com/yahoo/metrics/simple/PointBuilder.java
index 47061eba10b..a107bea3168 100644
--- a/container-core/src/main/java/com/yahoo/metrics/simple/PointBuilder.java
+++ b/container-core/src/main/java/com/yahoo/metrics/simple/PointBuilder.java
@@ -27,18 +27,12 @@ public final class PointBuilder {
     }
 
     PointBuilder(Point p) {
-        dimensions = new ArrayList<>();
-        location = new ArrayList<>();
         if (p != null) {
             int size = p.dimensionality();
             dimensions = new ArrayList<>(size+2);
             location = new ArrayList<>(size+2);
-            for (String dimensionName : p.getDimensions()) {
-                dimensions.add(dimensionName);
-            }
-            for (Value dimensionValue : p.getLocation()) {
-                location.add(dimensionValue);
-            }
+            Collections.addAll(dimensions, p.getDimensions());
+            Collections.addAll(location, p.getLocation());
         } else {
             dimensions = new ArrayList<>(4);
             location = new ArrayList<>(4);
diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/jdisc/SimpleMetricConsumer.java b/container-core/src/main/java/com/yahoo/metrics/simple/jdisc/SimpleMetricConsumer.java
index 3a40958f0b1..0286684c34c 100644
--- a/container-core/src/main/java/com/yahoo/metrics/simple/jdisc/SimpleMetricConsumer.java
+++ b/container-core/src/main/java/com/yahoo/metrics/simple/jdisc/SimpleMetricConsumer.java
@@ -45,7 +45,7 @@ public class SimpleMetricConsumer implements MetricConsumer {
 
     @Override
     public Context createContext(Map<String, ?> properties) {
-        if (properties == null)
+        if ((properties == null) || properties.isEmpty())
             return Point.emptyPoint();
         return new Point(properties);
     }