|
@@ -130,18 +130,26 @@ public class TextFile {
|
130
|
130
|
* @throws IOException If an I/O exception occurs
|
131
|
131
|
*/
|
132
|
132
|
public void readLines() throws IOException {
|
133
|
|
- final BufferedReader reader = new BufferedReader(
|
134
|
|
- new InputStreamReader(file == null ? is : new FileInputStream(file),
|
135
|
|
- charset));
|
136
|
|
- lines = new ArrayList<String>();
|
137
|
|
-
|
138
|
|
- String line;
|
139
|
|
-
|
140
|
|
- while ((line = reader.readLine()) != null) {
|
141
|
|
- lines.add(line);
|
|
133
|
+ BufferedReader reader = null;
|
|
134
|
+ InputStreamReader inputReader = null;
|
|
135
|
+ InputStream inputStream = null;
|
|
136
|
+
|
|
137
|
+ try {
|
|
138
|
+ inputStream = file == null ? is : new FileInputStream(file);
|
|
139
|
+ inputReader = new InputStreamReader(inputStream, charset);
|
|
140
|
+ reader = new BufferedReader(inputReader);
|
|
141
|
+ lines = new ArrayList<String>();
|
|
142
|
+
|
|
143
|
+ String line;
|
|
144
|
+
|
|
145
|
+ while ((line = reader.readLine()) != null) {
|
|
146
|
+ lines.add(line);
|
|
147
|
+ }
|
|
148
|
+ } finally {
|
|
149
|
+ StreamUtil.close(reader);
|
|
150
|
+ StreamUtil.close(inputReader);
|
|
151
|
+ StreamUtil.close(inputStream);
|
142
|
152
|
}
|
143
|
|
-
|
144
|
|
- reader.close();
|
145
|
153
|
}
|
146
|
154
|
|
147
|
155
|
/**
|