[KARAF-6224] Be sure configuration is loaded in early stage of activa…

…tor start
apache · Sep 22, 2019 · a997575 · a997575
1 parent 66827d1
commit a997575
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 0 deletions.
diff --git a/http/src/main/java/org/apache/karaf/http/core/internal/osgi/Activator.java b/http/src/main/java/org/apache/karaf/http/core/internal/osgi/Activator.java
@@ -65,6 +65,10 @@ protected void doStart() throws Exception {
             return;
         }
 
+        if (!ensureStartupConfiguration("org.apache.karaf.http")) {
+            return;
+        }
+
         final ServletEventHandler servletEventHandler = new ServletEventHandler();
         register(ServletListener.class, servletEventHandler);
 

diff --git a/kar/src/main/java/org/apache/karaf/kar/internal/osgi/Activator.java b/kar/src/main/java/org/apache/karaf/kar/internal/osgi/Activator.java
@@ -42,6 +42,10 @@ protected void doStart() throws Exception {
             return;
         }
 
+        if (!ensureStartupConfiguration("org.apache.karaf.kar")) {
+            return;
+        }
+
         boolean noAutoRefreshBundles = getBoolean("noAutoRefreshBundles", false);
         boolean noAutoStartBundles = getBoolean("noAutoStartBundles", false);
         String karStorage = getString("karStorage", System.getProperty("karaf.data") + File.separator + "kar");

diff --git a/log/src/main/java/org/apache/karaf/log/core/internal/osgi/Activator.java b/log/src/main/java/org/apache/karaf/log/core/internal/osgi/Activator.java
@@ -46,6 +46,10 @@ protected void doStart() throws Exception {
             return;
         }
 
+        if (!ensureStartupConfiguration("org.apache.karaf.log")) {
+            return;
+        }
+
         int size = getInt("size", 500);
         String pattern = getString("pattern", "%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n");
         String errorColor = getString("errorColor", "31");

diff --git a/management/server/src/main/java/org/apache/karaf/management/internal/Activator.java b/management/server/src/main/java/org/apache/karaf/management/internal/Activator.java
@@ -70,6 +70,10 @@ protected void doStart() throws Exception {
             return;
         }
 
+        if (!ensureStartupConfiguration("org.apache.karaf.management")) {
+            return;
+        }
+
         EventAdminLogger logger = null;
         if (getBoolean("audit.eventadmin.enabled", true)) {
             try {

diff --git a/profile/src/main/java/org/apache/karaf/profile/impl/osgi/Activator.java b/profile/src/main/java/org/apache/karaf/profile/impl/osgi/Activator.java
@@ -36,6 +36,10 @@ public class Activator extends BaseActivator implements ManagedService {
 
     @Override
     protected void doStart() throws Exception {
+        if (!ensureStartupConfiguration("org.apache.karaf.profile")) {
+            return;
+        }
+
         Path root = Paths.get(getString("profilesDirectory", System.getProperty("karaf.home") + "/profiles"));
         ProfileServiceImpl service = new ProfileServiceImpl(root);
         register(ProfileService.class, service);

diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java
@@ -93,6 +93,10 @@ protected void doStart() throws Exception {
             return;
         }
 
+        if (!ensureStartupConfiguration("org.apache.karaf.shell")) {
+            return;
+        }
+
         RegexCommandLoggingFilter filter = new RegexCommandLoggingFilter();
         filter.setPattern("ssh (.*?)-P +([^ ]+)");
         filter.setGroup(2);

diff --git a/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java b/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java
@@ -16,6 +16,7 @@
  */
 package org.apache.karaf.util.tracker;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
@@ -38,6 +39,8 @@
 import java.util.stream.StreamSupport;
 
 import org.osgi.framework.*;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -144,6 +147,23 @@ protected void doStop() {
         }
     }
 
+    protected boolean ensureStartupConfiguration(String configId) throws IOException {
+        if (this.configuration != null) {
+            return true;
+        }
+        ConfigurationAdmin configurationAdmin = getTrackedService(ConfigurationAdmin.class);
+        if (configurationAdmin != null) {
+            Configuration configuration = configurationAdmin.getConfiguration(configId);
+            Dictionary<String, Object> properties = (configuration == null) ? null : configuration.getProperties();
+
+            if (properties != null) {
+                this.configuration = properties;
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Called in {@link #doOpen()}.
      *