Close a stream when done

compiler/java/com/google/dart/compiler/common/SourceInfo.java

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 package com.google.dart.compiler.common;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.MapMaker;
 import com.google.dart.compiler.Source;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
 /**
  * Contains {@link Source} and location information for AST nodes.
  * <p>
  * Each node in the subtree (other than the contrived nodes) carries source range(s) information
  * relating back to positions in the given source (the given source itself is not remembered with
@@ skipping 35 matching lines @@
       lines.put(source, linesInfo);
     }
     return linesInfo;
   }
 
   /**
    * @return the new {@link LinesInfo}, may be empty if some {@link Exception} happens, but not
    *         <code>null</code>.
    */
   private static LinesInfo createLinesInfo(Source source) {
+    BufferedReader reader = null;
     try {
-      BufferedReader reader = new BufferedReader(source.getSourceReader());
+      reader = new BufferedReader(source.getSourceReader());
       int offset = 0;
       boolean ignoreLF = false;
       List<Integer> lineOffsets = Lists.newArrayList(0);
       while (true) {
         int charValue = reader.read();
         if (charValue == -1) {
           break;
         }
         offset++;
         char c = (char) charValue;
         ignoreLF = c == '\n';
         if (c == '\n' || c == '\r' && !ignoreLF) {
           lineOffsets.add(offset);
         }
       }
       return new LinesInfo(lineOffsets);
     } catch (Throwable e) {
       return new LinesInfo(ImmutableList.of(0));
+    } finally {
+      if (reader != null) {

[scheglov, 2012/03/16 21:33:22]

com.google.common.io.Closeables.closeQuietly(Closeable) ?

[Brian Wilkerson, 2012/03/16 21:45:07]

Sure, but in a later CL.

+        try {
+          reader.close();
+        } catch (IOException e) {
+          // Ignored
+        }
+      }
     }
   }
 
   /**
    * @return the {@link Source}.
    */
   public Source getSource() {
     return source;
   }
 
@@ skipping 56 matching lines @@
       }
       return -(2 + index);
     }
 
     int getColumnOfOffset(int offset) {
       int line = getLineOfOffset(offset);
       return offset - getLineOffset(line);
     }
   }
 }