Fix #286 fix regression in Dropwizard runtime dependency

pull/294/head
Brett Wooldridge 10 years ago
parent b6a3f3d346
commit 2cabded7f4

@ -147,7 +147,8 @@ public abstract class BaseHikariPool implements HikariPoolMBean, IBagStateListen
this.isIsolateInternalQueries = configuration.isIsolateInternalQueries(); this.isIsolateInternalQueries = configuration.isIsolateInternalQueries();
this.isUseJdbc4Validation = configuration.getConnectionTestQuery() == null; this.isUseJdbc4Validation = configuration.getConnectionTestQuery() == null;
setMetricRegistry((MetricRegistry) configuration.getMetricRegistry()); setMetricRegistry(configuration.getMetricRegistry());
setHealthCheckRegistry(configuration.getHealthCheckRegistry());
this.dataSource = poolUtils.initializeDataSource(configuration.getDataSourceClassName(), configuration.getDataSource(), configuration.getDataSourceProperties(), configuration.getJdbcUrl(), username, password); this.dataSource = poolUtils.initializeDataSource(configuration.getDataSourceClassName(), configuration.getDataSource(), configuration.getDataSourceProperties(), configuration.getJdbcUrl(), username, password);
@ -161,10 +162,6 @@ public abstract class BaseHikariPool implements HikariPoolMBean, IBagStateListen
this.houseKeepingExecutorService.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); this.houseKeepingExecutorService.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
this.leakTask = (configuration.getLeakDetectionThreshold() == 0) ? LeakTask.NO_LEAK : new LeakTask(configuration.getLeakDetectionThreshold(), houseKeepingExecutorService); this.leakTask = (configuration.getLeakDetectionThreshold() == 0) ? LeakTask.NO_LEAK : new LeakTask(configuration.getLeakDetectionThreshold(), houseKeepingExecutorService);
if (configuration.getHealthCheckRegistry() != null) {
setHealthCheckRegistry((HealthCheckRegistry) configuration.getHealthCheckRegistry());
}
setRemoveOnCancelPolicy(houseKeepingExecutorService); setRemoveOnCancelPolicy(houseKeepingExecutorService);
poolUtils.setLoginTimeout(dataSource, connectionTimeout); poolUtils.setLoginTimeout(dataSource, connectionTimeout);
registerMBeans(configuration, this); registerMBeans(configuration, this);
@ -379,20 +376,22 @@ public abstract class BaseHikariPool implements HikariPoolMBean, IBagStateListen
} }
} }
public void setMetricRegistry(MetricRegistry metricRegistry) public void setMetricRegistry(Object metricRegistry)
{ {
this.isRecordMetrics = metricRegistry != null; this.isRecordMetrics = metricRegistry != null;
if (isRecordMetrics) { if (isRecordMetrics) {
this.metricsTracker = new CodaHaleMetricsTracker(this, metricRegistry); this.metricsTracker = new CodaHaleMetricsTracker(this, (MetricRegistry) metricRegistry);
} }
else { else {
this.metricsTracker = new MetricsTracker(this); this.metricsTracker = new MetricsTracker(this);
} }
} }
public void setHealthCheckRegistry(HealthCheckRegistry healthCheckRegistry) public void setHealthCheckRegistry(Object healthCheckRegistry)
{ {
CodahaleHealthChecker.registerHealthChecks(this, healthCheckRegistry); if (healthCheckRegistry != null) {
CodahaleHealthChecker.registerHealthChecks(this, (HealthCheckRegistry) healthCheckRegistry);
}
} }
// *********************************************************************** // ***********************************************************************

Loading…
Cancel
Save