github-forks
/
HikariCP
mirror of https://github.com/brettwooldridge/HikariCP.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix NPE caused by merge.

Browse Source
pull/927/head
Brett Wooldridge 7 years ago
parent 43b423cc5a
commit 2a9e0185e4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/com/zaxxer/hikari/pool/HikariPool.java
Unescape Escape View File

@ -272,10 +272,10 @@ public final class HikariPool extends PoolBase implements HikariPoolMXBean, IBag
public void setMetricRegistry(Object metricRegistry) public void setMetricRegistry(Object metricRegistry)
{ {
if (metricRegistry.getClass().getName().contains("MetricRegistry")) { if (metricRegistry != null && metricRegistry.getClass().getName().contains("MetricRegistry")) {
setMetricsTrackerFactory(new CodahaleMetricsTrackerFactory((MetricRegistry) metricRegistry)); setMetricsTrackerFactory(new CodahaleMetricsTrackerFactory((MetricRegistry) metricRegistry));
} }
else if (metricRegistry.getClass().getName().contains("MeterRegistry")) { else if (metricRegistry != null && metricRegistry.getClass().getName().contains("MeterRegistry")) {
setMetricsTrackerFactory(new MicrometerMetricsTrackerFactory((MeterRegistry) metricRegistry)); setMetricsTrackerFactory(new MicrometerMetricsTrackerFactory((MeterRegistry) metricRegistry));
} }
else { else {

Write Preview
Loading…
Cancel
Save