diff options
author | gjoranv <gv@verizonmedia.com> | 2020-09-28 08:50:44 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2020-09-28 08:50:44 +0200 |
commit | 87af53c51538340c699aec33e011a92a5c95089f (patch) | |
tree | 58509abb7b4794737d9b48d9e30aed0fac230969 /container-core/src/main/java/com/yahoo/container/core | |
parent | 044494d83632d11b96e9319c7184a3a973b77f67 (diff) |
Remove the special rule that allowed pre-installing bundles
.. for old versions of the config-model-fat-amended bundle.
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/core')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java index f87dd3f42d2..6ecb6c75f90 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java @@ -103,9 +103,7 @@ public class ApplicationBundleLoader { // it means that the X-JDisc-Preinstall-Bundle header was used. // However, test osgi frameworks may return multiple bundles when installing a single bundle. if (bundles.size() > 1 && osgi.hasFelixFramework()) { - // TODO: remove if-statement below when the last model with preinstall has rolled out of hosted - if (! bundles.get(0).getSymbolicName().equals("config-model-fat-amended")) - throw new RuntimeException("Bundle '" + bundles.get(0).getSymbolicName() + "' tried to pre-install bundles from disk."); + throw new RuntimeException("Bundle '" + bundles.get(0).getSymbolicName() + "' tried to pre-install bundles from disk."); } reference2Bundle.put(reference, bundles.get(0)); } |