From 16dbc953d1a29605ccfbc5f0202edfd5abac1e9f Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Tue, 14 Oct 2014 07:51:02 +0900 Subject: [PATCH] Remove unnecessary check. --- .../com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java | 6 ++---- .../com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java index d7d12717..5e9f90af 100644 --- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java +++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java @@ -33,7 +33,7 @@ public final class CodaHaleMetricsTracker extends MetricsTracker registry = new MetricRegistry(); connectionObtainTimer = registry.timer(MetricRegistry.name(pool.getConfiguration().getPoolName(), "-connection", "Wait")); - connectionUsage = registry.histogram(MetricRegistry.name(pool.getConfiguration().getPoolName(), "-connection", "Wsage")); + connectionUsage = registry.histogram(MetricRegistry.name(pool.getConfiguration().getPoolName(), "-connection", "Usage")); } /** {@inheritDoc} */ @@ -71,9 +71,7 @@ public final class CodaHaleMetricsTracker extends MetricsTracker public void stop() { - if (innerContext != null) { - innerContext.stop(); - } + innerContext.stop(); } } } diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java b/hikaricp/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java index 645a0b1f..5e9f90af 100644 --- a/hikaricp/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java +++ b/hikaricp/src/main/java/com/zaxxer/hikari/metrics/CodaHaleMetricsTracker.java @@ -71,9 +71,7 @@ public final class CodaHaleMetricsTracker extends MetricsTracker public void stop() { - if (innerContext != null) { - innerContext.stop(); - } + innerContext.stop(); } } }