X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.init%2Fsrc%2Forg%2Fargeo%2Finit%2Fosgi%2FOsgiRuntimeContext.java;h=8afe05922ef5d57686be46b37480aebd65514e6b;hb=a63b0d9025acf74e96dfd2e462b4c4d5a534d74e;hp=186577b4dba40dda3ee7169b0d2bb4c863489c10;hpb=4235781f057646dd28bd53ab245695347a18d885;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.init/src/org/argeo/init/osgi/OsgiRuntimeContext.java b/org.argeo.init/src/org/argeo/init/osgi/OsgiRuntimeContext.java
index 186577b4d..8afe05922 100644
--- a/org.argeo.init/src/org/argeo/init/osgi/OsgiRuntimeContext.java
+++ b/org.argeo.init/src/org/argeo/init/osgi/OsgiRuntimeContext.java
@@ -1,5 +1,6 @@
 package org.argeo.init.osgi;
 
+import java.io.Serializable;
 import java.lang.System.LoggerFinder;
 import java.util.Collections;
 import java.util.Hashtable;
@@ -9,9 +10,9 @@ import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.concurrent.Flow;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import org.argeo.init.RuntimeContext;
-import org.argeo.init.logging.ThinLoggerFinder;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
@@ -63,14 +64,22 @@ public class OsgiRuntimeContext implements RuntimeContext, AutoCloseable {
 //		bundleContext.registerService(AbstractPreferences.class, systemRootPreferences, new Hashtable<>());
 
 		// Make sure LoggerFinder has been searched for, since it is lazily loaded
-		LoggerFinder.getLoggerFinder();
-
-		// logging
-		bundleContext.registerService(Consumer.class, ThinLoggerFinder.getConfigurationConsumer(),
-				new Hashtable<>(Collections.singletonMap(Constants.SERVICE_PID, "argeo.logging.configuration")));
-		bundleContext.registerService(Flow.Publisher.class, ThinLoggerFinder.getLogEntryPublisher(),
-				new Hashtable<>(Collections.singletonMap(Constants.SERVICE_PID, "argeo.logging.publisher")));
-
+		LoggerFinder loggerFinder = LoggerFinder.getLoggerFinder();
+
+		if (loggerFinder instanceof Consumer<?> && loggerFinder instanceof Supplier<?>) {
+			@SuppressWarnings("unchecked")
+			Consumer<Map<String, Object>> consumer = (Consumer<Map<String, Object>>) loggerFinder;
+			// ThinLoggerFinder.getConfigurationConsumer()
+			// ThinLoggerFinder.getLogEntryPublisher()
+
+			@SuppressWarnings("unchecked")
+			Supplier<Flow.Publisher<Map<String, Serializable>>> supplier = (Supplier<Flow.Publisher<Map<String, Serializable>>>) loggerFinder;
+			// logging
+			bundleContext.registerService(Consumer.class, consumer,
+					new Hashtable<>(Collections.singletonMap(Constants.SERVICE_PID, "argeo.logging.configuration")));
+			bundleContext.registerService(Flow.Publisher.class, supplier.get(),
+					new Hashtable<>(Collections.singletonMap(Constants.SERVICE_PID, "argeo.logging.publisher")));
+		}
 		osgiBoot = new OsgiBoot(bundleContext);
 		osgiBoot.bootstrap(config);