Skip to content

GROOVY-8373: Fix resource leak in filterLine Writable.writeTo method #2352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blackdrag wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −9
Open

GROOVY-8373: Fix resource leak in filterLine Writable.writeTo method #2352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/main/java/org/codehaus/groovy/runtime/IOGroovyMethods.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1500,17 +1500,21 @@ public static Writable filterLine(Reader reader, @ClosureParams(value=SimpleType
return new Writable() {
@Override
public Writer writeTo(Writer out) throws IOException {
BufferedWriter bw = new BufferedWriter(out);
String line;
BooleanClosureWrapper bcw = new BooleanClosureWrapper(closure);
while ((line = br.readLine()) != null) {
if (bcw.call(line)) {
bw.write(line);
bw.newLine();
try {
BufferedWriter bw = new BufferedWriter(out);
String line;
BooleanClosureWrapper bcw = new BooleanClosureWrapper(closure);
while ((line = br.readLine()) != null) {
if (bcw.call(line)) {
bw.write(line);
bw.newLine();
}
}
bw.flush();
return out;
} finally {
closeWithWarning(br);
}
bw.flush();
return out;
}

@Override
Expand Down
Loading