Fix CI tests.

afoucret · Dec 12, 2023 · c31fc58 · c31fc58
1 parent eed448a
commit c31fc58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java
@@ -889,7 +889,7 @@ private static void reportClashingNodeAttribute(String attrName) {
 
     @Override
     public List<RescorerSpec<?>> getRescorers() {
-        if (enabled && machineLearningExtension.get().isLearningToRankEnabled()) {
+        if (enabled && machineLearningExtension.get() != null && machineLearningExtension.get().isLearningToRankEnabled()) {
             return List.of(
                 new RescorerSpec<>(
                     LearningToRankRescorerBuilder.NAME,

diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MachineLearningTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MachineLearningTests.java
@@ -385,8 +385,6 @@ protected XPackLicenseState getLicenseState() {
     }
 
     public static MachineLearning createTrialLicensedMachineLearning(Settings settings) {
-        MachineLearning plugin = new TrialLicensedMachineLearning(settings);
-        plugin.loadExtensions(null);
-        return plugin;
+        return new TrialLicensedMachineLearning(settings);
     }
 }