svn commit: r1836283 - /aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java

[ro...@apache.org]

Author: rotty3000
Date: Thu Jul 19 17:37:40 2018
New Revision: 1836283

URL: http://svn.apache.org/viewvc?rev=1836283&view=rev
Log:
Revert "ARIES-1814 Solve the start order limitations with SPI Fly by then eliminating unused dependency on Log Service"

This reverts commit 255d3994cc87f1e28f57948e7b1cc18890b61970.

Modified:
    aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java

Modified: aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java?rev=1836283&r1=1836282&r2=1836283&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java (original)
+++ aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java Thu Jul 19 17:37:40 2018
@@ -34,6 +34,7 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
@@ -41,6 +42,7 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.framework.wiring.BundleWire;
 import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.service.log.LogService;
 import org.osgi.util.tracker.BundleTracker;
 
 public abstract class BaseActivator implements BundleActivator {
@@ -52,6 +54,7 @@ public abstract class BaseActivator impl
     public static BaseActivator activator;
 
     private BundleContext bundleContext;
+    private List<LogService> logServices = new CopyOnWriteArrayList<LogService>();
     private BundleTracker consumerBundleTracker;
     private BundleTracker providerBundleTracker;
 
@@ -149,9 +152,19 @@ public abstract class BaseActivator impl
     }
 
     public void log(int level, String message) {
+        synchronized (logServices) {
+            for (LogService log : logServices) {
+                log.log(level, message);
+            }
+        }
     }
 
     public void log(int level, String message, Throwable th) {
+        synchronized (logServices) {
+            for (LogService log : logServices) {
+                log.log(level, message, th);
+            }
+        }
     }
 
     public Set<WeavingData> getWeavingData(Bundle b) {