Revert "WiCKET-6127 WICKET-6128 Use IInitializer and ServletContext to store the MetricRegistry"
This reverts commit 6e4690f6986c1f2cf896ab5b50ae4e58a915cbd0. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/528bc411 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/528bc411 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/528bc411 Branch: refs/heads/master Commit: 528bc4118d069e419a1c05dcab2c1a092dcc8d83 Parents: 63eca84 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Mar 29 08:55:50 2016 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Mar 29 08:55:50 2016 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/metrics/Initializer.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/528bc411/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/Initializer.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/Initializer.java b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/Initializer.java index 95c9209..cd3fbc4 100644 --- a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/Initializer.java +++ b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/Initializer.java @@ -21,21 +21,16 @@ public class Initializer implements IInitializer @Override public void init(Application application) { - WebApplication webApplication = (WebApplication) application; - ServletContext servletContext = webApplication.getServletContext(); - - MetricRegistry metricRegistry = (MetricRegistry) servletContext.getAttribute(METRICS_SERVLET_REGISTRY); - WicketMetricsSettings metricsSettings = (WicketMetricsSettings) servletContext.getAttribute(WICKET_METRICS_SETTINGS); - if (metricRegistry == null) - { - metricRegistry = new MetricRegistry(); - metricsSettings = new WicketMetricsSettings(); - servletContext.setAttribute(METRICS_SERVLET_REGISTRY, metricRegistry); - servletContext.setAttribute(WICKET_METRICS_SETTINGS, metricsSettings); - } + MetricRegistry metricRegistry = new MetricRegistry(); + WicketMetricsSettings metricsSettings = new WicketMetricsSettings(); application.setMetaData(WicketMetrics.METRIC_REGISTRY, metricRegistry); application.setMetaData(WicketMetrics.METRIC_SETTINGS, metricsSettings); + + WebApplication webApplication = (WebApplication) application; + ServletContext servletContext = webApplication.getServletContext(); + servletContext.setAttribute(METRICS_SERVLET_REGISTRY, metricRegistry); + servletContext.setAttribute(WICKET_METRICS_SETTINGS, metricsSettings); } @Override
