You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2018/07/16 20:03:32 UTC

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

Author: rotty3000
Date: Mon Jul 16 20:03:31 2018
New Revision: 1836063

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

Signed-off-by: Raymond Auge <ro...@apache.org>

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=1836063&r1=1836062&r2=1836063&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 Mon Jul 16 20:03:31 2018
@@ -34,7 +34,6 @@ 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;
@@ -42,7 +41,6 @@ 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 {
@@ -54,7 +52,6 @@ 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;
 
@@ -152,19 +149,9 @@ 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) {