aboutsummaryrefslogtreecommitdiffstats
path: root/jdisc_core
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-11-04 21:23:21 +0100
committerJon Bratseth <bratseth@gmail.com>2020-11-04 21:23:21 +0100
commit3c49543bb514abd8c3040fc4355f6ccc537468e1 (patch)
treee9b48215a89c2170853a3fd16e69b5b70846c8e3 /jdisc_core
parent95ca6fdcb45b1d3ae805c5c9f3d20cc7972f136d (diff)
Revert "Merge pull request #15181 from vespa-engine/revert-15180-bratseth/override-in-variant-references"
This reverts commit 95ca6fdcb45b1d3ae805c5c9f3d20cc7972f136d, reversing changes made to 19f9396e6b60e49c7830d78d504a14c015600f2b.
Diffstat (limited to 'jdisc_core')
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogManager.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogManager.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogManager.java
index 5b0367c5a55..ee1939d9bbe 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogManager.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogManager.java
@@ -26,12 +26,11 @@ class OsgiLogManager implements LogService {
this.configureLogLevel = configureLogLevel;
}
- @SuppressWarnings("unchecked")
- public void install(final BundleContext osgiContext) {
+ public void install(BundleContext osgiContext) {
if (tracker != null) {
throw new IllegalStateException("OsgiLogManager already installed.");
}
- tracker = new ServiceTracker<>(osgiContext, LogService.class, new ServiceTrackerCustomizer<LogService,LogService>() {
+ tracker = new ServiceTracker<>(osgiContext, LogService.class, new ServiceTrackerCustomizer<>() {
@Override
public LogService addingService(ServiceReference<LogService> reference) {