Skip to content
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

Jump to bottom

Close the stream properly to avoid lock when using jenkins ui and git scriptler repo #35

Merged
merged 1 commit into from
Sep 28, 2019
Merged

Close the stream properly to avoid lock when using jenkins ui and git scriptler repo #35

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
8 changes: 5 additions & 3 deletions src/main/java/org/jenkinsci/plugins/scriptler/util/ScriptHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
import hudson.model.Computer;
import hudson.util.StreamTaskListener;

import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
Expand Down Expand Up @@ -70,9 +72,9 @@ public class ScriptHelper {
}
Script s = ScriptlerConfiguration.getConfiguration().getScriptById(id);
if (withSrc && s != null) {
try {
File scriptSrc = new File(ScriptlerManagement.getScriptDirectory(), s.getScriptPath());
Reader reader = new InputStreamReader(new FileInputStream(scriptSrc), Charset.forName("UTF-8"));
File scriptSrc = new File(ScriptlerManagement.getScriptDirectory(), s.getScriptPath());
try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(scriptSrc),
Charset.forName("UTF-8")))) {
String src = IOUtils.toString(reader);
s.setScript(src);
} catch (IOException e) {
Expand Down