From 2df43be4d3f56d41edfd56db298067312d148e0d Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Fri, 27 Mar 2015 16:31:07 +0100 Subject: [PATCH] Need to test metrics is not null to return a relevant value --- src/main/java/io/vertx/core/http/impl/HttpServerImpl.java | 2 +- src/main/java/io/vertx/core/net/impl/NetServerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/vertx/core/http/impl/HttpServerImpl.java b/src/main/java/io/vertx/core/http/impl/HttpServerImpl.java index e85d058ff..dbb5fbcab 100644 --- a/src/main/java/io/vertx/core/http/impl/HttpServerImpl.java +++ b/src/main/java/io/vertx/core/http/impl/HttpServerImpl.java @@ -376,7 +376,7 @@ public class HttpServerImpl implements HttpServer, Closeable, MetricsProvider { @Override public String metricBaseName() { - return metrics.baseName(); + return metrics != null ? metrics.baseName() : null; } SSLHelper getSslHelper() { diff --git a/src/main/java/io/vertx/core/net/impl/NetServerImpl.java b/src/main/java/io/vertx/core/net/impl/NetServerImpl.java index 2240232d3..55691df38 100644 --- a/src/main/java/io/vertx/core/net/impl/NetServerImpl.java +++ b/src/main/java/io/vertx/core/net/impl/NetServerImpl.java @@ -320,7 +320,7 @@ public class NetServerImpl implements NetServer, Closeable, MetricsProvider { @Override public String metricBaseName() { - return metrics.baseName(); + return metrics != null ? metrics.baseName() : null; } @Override