Encapsulate in a context

1 files changed, 3 insertions, 1 deletions

diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EmbedExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EmbedExpression.java
index 043a30ce66d..66d912cd987 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EmbedExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EmbedExpression.java
@@ -40,7 +40,9 @@ public class EmbedExpression extends Expression  {
     @Override
     protected void doExecute(ExecutionContext context) {
         StringFieldValue input = (StringFieldValue) context.getValue();
-        Tensor tensor = embedder.embed(input.getString(), context.getLanguage(), destination, targetType);
+        Tensor tensor = embedder.embed(input.getString(),
+                                       new Embedder.Context(destination).setLanguage(context.getLanguage()),
+                                       targetType);
         context.setValue(new TensorFieldValue(tensor));
     }