Close readers

2 files changed, 5 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConvertedModel.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConvertedModel.java
index b645af582e1..0911f567fa1 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConvertedModel.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConvertedModel.java
@@ -494,12 +494,12 @@ public class ConvertedModel {
             ApplicationFile expressionPath = application.getFile(modelFiles.expressionsPath());
             if ( ! expressionPath.exists() || ! expressionPath.isDirectory()) return Collections.emptyMap();
             for (ApplicationFile expressionFile : expressionPath.listFiles()) {
-                try {
+                try (Reader reader = new BufferedReader(expressionFile.createReader())){
                     String name = expressionFile.getPath().getName();
-                    expressions.put(name, new RankingExpression(name, expressionFile.createReader()));
+                    expressions.put(name, new RankingExpression(name, reader));
                 }
-                catch (FileNotFoundException e) {
-                    throw new IllegalStateException("Expression file removed while reading: " + expressionFile, e);
+                catch (IOException e) {
+                    throw new UncheckedIOException("Failed reading " + expressionFile.getPath(), e);
                 }
                 catch (ParseException e) {
                     throw new IllegalStateException("Invalid stored expression in " + expressionFile, e);
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/ModelImporter.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/ModelImporter.java
index 41817eb3e62..13718935cef 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/ModelImporter.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/ModelImporter.java
@@ -156,7 +156,7 @@ public abstract class ModelImporter {
     private static void importRankingExpression(IntermediateOperation operation, ImportedModel model) {
         if (operation.function().isPresent()) {
             String name = operation.name();
-            if (!model.expressions().containsKey(name)) {
+            if ( ! model.expressions().containsKey(name)) {
                 TensorFunction function = operation.function().get();
 
                 if (isSignatureOutput(model, operation)) {