Repository: wicket Updated Branches: refs/heads/master c451d4cbc -> d01a07d51
Revert "WiCKET-6127 WICKET-6128 Use IInitializer and ServletContext to store the MetricRegistry" This reverts commit c451d4cbc94e052c36af1c99652d9b55ca78f10b. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/63eca84f Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/63eca84f Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/63eca84f Branch: refs/heads/master Commit: 63eca84f25f9c4f169c85f547bc6988a4ee24ef6 Parents: c451d4c Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Mar 29 08:55:46 2016 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Mar 29 08:55:46 2016 +0200 ---------------------------------------------------------------------- .../metrics/aspects/session/SessionCountListenerAspect.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/63eca84f/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListenerAspect.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListenerAspect.java b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListenerAspect.java index e547a3f..d80c600 100644 --- a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListenerAspect.java +++ b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListenerAspect.java @@ -50,7 +50,7 @@ public class SessionCountListenerAspect extends WicketMetrics MetricRegistry metricRegistry = (MetricRegistry) methodArguments[1]; WicketMetricsSettings metricsSettings = (WicketMetricsSettings) methodArguments[2]; - return counter("core/session/count", null, CounterOperation.INC, 1L, metricRegistry, metricsSettings); + return counter("core/session/count", joinPoint, CounterOperation.INC, 1L, metricRegistry, metricsSettings); } /** @@ -69,7 +69,7 @@ public class SessionCountListenerAspect extends WicketMetrics MetricRegistry metricRegistry = (MetricRegistry) methodArguments[1]; WicketMetricsSettings metricsSettings = (WicketMetricsSettings) methodArguments[2]; - return counter("core/session/count", null, CounterOperation.DEC, 1L, metricRegistry, metricsSettings); + return counter("core/session/count", joinPoint, CounterOperation.DEC, 1L, metricRegistry, metricsSettings); } }
