commit | ca158c516b8ef024b41a1993276da988d9d1cce1 | [log] [tgz] |
---|---|---|
author | Karl Pauls <karlpauls@gmail.com> | Wed Feb 21 14:09:03 2018 +0100 |
committer | Karl Pauls <karlpauls@gmail.com> | Wed Feb 21 14:09:03 2018 +0100 |
tree | 7922fe21897a8ee03e49f0d0e387f3cc1a39196f | |
parent | 857709ca8a1861568dc4b9182a2c0c0817a81342 [diff] |
SLING-7507: open the service tracker when the LogbackManager is initalized to prevent an NPE.
diff --git a/src/main/java/org/apache/sling/commons/log/logback/internal/FilterTracker.java b/src/main/java/org/apache/sling/commons/log/logback/internal/FilterTracker.java index 2ab960b..6e4403d 100644 --- a/src/main/java/org/apache/sling/commons/log/logback/internal/FilterTracker.java +++ b/src/main/java/org/apache/sling/commons/log/logback/internal/FilterTracker.java
@@ -52,7 +52,6 @@ this.logbackManager = logbackManager; this.loggerContext = logbackManager.getLoggerContext(); this.contextUtil = new ContextUtil(loggerContext); - super.open(); } @SuppressWarnings("unchecked")
diff --git a/src/main/java/org/apache/sling/commons/log/logback/internal/LogbackManager.java b/src/main/java/org/apache/sling/commons/log/logback/internal/LogbackManager.java index e63c6e5..1dbf11c 100644 --- a/src/main/java/org/apache/sling/commons/log/logback/internal/LogbackManager.java +++ b/src/main/java/org/apache/sling/commons/log/logback/internal/LogbackManager.java
@@ -170,6 +170,8 @@ serviceTrackers.add(filterTracker); serviceTrackers.add(turboFilterTracker); + this.filterTracker.open(); + this.turboFilterTracker.open(); getLoggerContext().addListener(osgiIntegrationListener); registerWebConsoleSupport(); registerEventHandler();
diff --git a/src/main/java/org/apache/sling/commons/log/logback/internal/TurboFilterTracker.java b/src/main/java/org/apache/sling/commons/log/logback/internal/TurboFilterTracker.java index 7c24493..33cf57b 100644 --- a/src/main/java/org/apache/sling/commons/log/logback/internal/TurboFilterTracker.java +++ b/src/main/java/org/apache/sling/commons/log/logback/internal/TurboFilterTracker.java
@@ -35,7 +35,6 @@ public TurboFilterTracker(BundleContext context, LoggerContext loggerContext) { super(context, TurboFilter.class.getName(), null); this.loggerContext = loggerContext; - super.open(); } @Override