1 files changed, 12 insertions, 1 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;