Make sure the scanner is always closed.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1539801 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

src/main/java/org/apache/commons/codec/language/bm/Lang.java

@@ -135,47 +135,51 @@ public static Lang loadFromResource(final String languageRulesResourceName, fina
         }
 
         final Scanner scanner = new Scanner(lRulesIS, ResourceConstants.ENCODING);
-        boolean inExtendedComment = false;
-        while (scanner.hasNextLine()) {
-            final String rawLine = scanner.nextLine();
-            String line = rawLine;
-            if (inExtendedComment) {
-                // check for closing comment marker, otherwise discard doc comment line
-                if (line.endsWith(ResourceConstants.EXT_CMT_END)) {
-                    inExtendedComment = false;
-                }
-            } else {
-                if (line.startsWith(ResourceConstants.EXT_CMT_START)) {
-                    inExtendedComment = true;
-                } else {
-                    // discard comments
-                    final int cmtI = line.indexOf(ResourceConstants.CMT);
-                    if (cmtI >= 0) {
-                        line = line.substring(0, cmtI);
-                    }
-
-                    // trim leading-trailing whitespace
-                    line = line.trim();
-
-                    if (line.length() == 0) {
-                        continue; // empty lines can be safely skipped
+        try {
+            boolean inExtendedComment = false;
+            while (scanner.hasNextLine()) {
+                final String rawLine = scanner.nextLine();
+                String line = rawLine;
+                if (inExtendedComment) {
+                    // check for closing comment marker, otherwise discard doc comment line
+                    if (line.endsWith(ResourceConstants.EXT_CMT_END)) {
+                        inExtendedComment = false;
                     }
-
-                    // split it up
-                    final String[] parts = line.split("\\s+");
-
-                    if (parts.length != 3) {
-                        throw new IllegalArgumentException("Malformed line '" + rawLine + "' in language resource '" +
-                                                           languageRulesResourceName + "'");
+                } else {
+                    if (line.startsWith(ResourceConstants.EXT_CMT_START)) {
+                        inExtendedComment = true;
+                    } else {
+                        // discard comments
+                        final int cmtI = line.indexOf(ResourceConstants.CMT);
+                        if (cmtI >= 0) {
+                            line = line.substring(0, cmtI);
+                        }
+
+                        // trim leading-trailing whitespace
+                        line = line.trim();
+
+                        if (line.length() == 0) {
+                            continue; // empty lines can be safely skipped
+                        }
+
+                        // split it up
+                        final String[] parts = line.split("\\s+");
+
+                        if (parts.length != 3) {
+                            throw new IllegalArgumentException("Malformed line '" + rawLine
+                                    + "' in language resource '" + languageRulesResourceName + "'");
+                        }
+
+                        final Pattern pattern = Pattern.compile(parts[0]);
+                        final String[] langs = parts[1].split("\\+");
+                        final boolean accept = parts[2].equals("true");
+
+                        rules.add(new LangRule(pattern, new HashSet<String>(Arrays.asList(langs)), accept));
                     }
-
-                    final Pattern pattern = Pattern.compile(parts[0]);
-                    final String[] langs = parts[1].split("\\+");
-                    final boolean accept = parts[2].equals("true");
-
-                    rules.add(new LangRule(pattern, new HashSet<String>(Arrays.asList(langs)), accept));
                 }
             }
+        } finally {
+            scanner.close();
         }
         return new Lang(rules, languages);
     }