2 files changed, 9 insertions, 7 deletions
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java
index f891d0c0a0a..44180b3f863 100644
--- a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java
+++ b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java
@@ -72,13 +72,14 @@ public class CppClassBuilder implements ClassBuilder {
     String readFile(File f) throws IOException {
         if (!f.isFile()) return null;
         StringBuilder sb = new StringBuilder();
-        BufferedReader sr = new BufferedReader(new FileReader(f));
-        while (true) {
-            String line = sr.readLine();
-            if (line == null) break;
-            sb.append(line).append("\n");
+        try (BufferedReader sr = new BufferedReader(new FileReader(f))) {
+            while (true) {
+                String line = sr.readLine();
+                if (line == null) break;
+                sb.append(line).append("\n");
+            }
+            return sb.toString();
         }
-        return sb.toString();
     }
 
     void writeFile(File f, String content) throws IOException {
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/NormalizedDefinition.java b/configgen/src/main/java/com/yahoo/config/codegen/NormalizedDefinition.java
index 849b4f34914..3250fc69ae8 100644
--- a/configgen/src/main/java/com/yahoo/config/codegen/NormalizedDefinition.java
+++ b/configgen/src/main/java/com/yahoo/config/codegen/NormalizedDefinition.java
@@ -19,7 +19,8 @@ import java.nio.charset.Charset;
  * @author hmusum
  */
 public class NormalizedDefinition {
-    /* Patterns used for finding ranges in config definitions */
+
+    // Patterns used for finding ranges in config definitions
     private static final Pattern intPattern = Pattern.compile(".*int.*range.*");
     private static final Pattern doublePattern = Pattern.compile(".*double.*range.*");
     private MessageDigest md5;