Bootstrap FelixParams at runtime.

- The set of system packages is not constant (nor is their order)
  between JVM invocations.

2 files changed, 13 insertions, 2 deletions

diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixParams.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixParams.java
index 10dbd09792f..9b877f68efd 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixParams.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixParams.java
@@ -12,10 +12,21 @@ import java.util.Map;
  */
 public class FelixParams {
 
-    private final StringBuilder exportPackages = new StringBuilder(ExportPackages.readExportProperty());
+    private final StringBuilder exportPackages;
     private String cachePath = null;
     private boolean loggerEnabled = true;
 
+    public FelixParams() {
+        this(ExportPackages.readExportProperty());
+    }
+
+    // For testing only
+    // Needed because the set of system packages is no longer constant between JVM invocations,
+    // since Felix 6 and JDK 9.
+    FelixParams(String exportPackages) {
+        this.exportPackages = new StringBuilder(exportPackages);
+    }
+
     public FelixParams exportPackage(String pkg) {
         exportPackages.append(",").append(pkg);
         return this;
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java
index 6836ebde496..3c74172b545 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java
@@ -31,7 +31,7 @@ public class FelixParamsTestCase {
     public void requireThatSystemPackagesAreNotReplaced() {
         String systemPackages = ExportPackages.getSystemPackages();
 
-        FelixParams params = new FelixParams();
+        FelixParams params = new FelixParams(systemPackages);
         Map<String, String> config = params.toConfig();
         assertNotNull(config);
         String str = config.get(Constants.FRAMEWORK_SYSTEMPACKAGES);