fix transport client mode

Hendrik Muhs · Hendrik Muhs · commit d493e3d244df · 2018-12-28T09:35:23.000+01:00
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningFeatureSet.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningFeatureSet.java
@@ -30,7 +30,6 @@
 import org.elasticsearch.xpack.core.ml.datafeed.DatafeedState;
 import org.elasticsearch.xpack.core.ml.job.config.Job;
 import org.elasticsearch.xpack.core.ml.job.config.JobState;
-import org.elasticsearch.xpack.ml.job.JobManager;
 import org.elasticsearch.xpack.ml.job.JobManagerHolder;
 import org.elasticsearch.xpack.ml.process.NativeController;
 import org.elasticsearch.xpack.ml.process.NativeControllerHolder;
@@ -175,7 +174,8 @@ public Retriever(Client client, JobManagerHolder jobManagerHolder, boolean avail
         }
 
         public void execute(ActionListener<Usage> listener) {
-            if (enabled == false) {
+            // empty holder means either ML disabled or transport client mode
+            if (jobManagerHolder.isEmpty()) {
                 listener.onResponse(
                     new MachineLearningFeatureSetUsage(available, enabled, Collections.emptyMap(), Collections.emptyMap(), 0));
                 return;
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManagerHolder.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManagerHolder.java
@@ -27,6 +27,10 @@ public JobManagerHolder(JobManager jobManager) {
         this.instance = jobManager;
     }
 
+    public boolean isEmpty() {
+        return instance == null;
+    }
+
     /**
      * Get the instance of the held JobManager.
      *

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ public JobManagerHolder(JobManager jobManager) {`
`27`	`27`	`this.instance = jobManager;`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ public boolean isEmpty() {`
	`31`	`+ return instance == null;`
	`32`	`+ }`
	`33`	`+`
`30`	`34`	`/**`
`31`	`35`	`* Get the instance of the held JobManager.`
`32`	`36`	`*`