Browse Source

InfoRefsServlet: Open OutputStreamWriter in try-with-resource

Change-Id: Iaf93d5c020ee67e9effbe93334f1ad419ffaee1f
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-4.11
David Pursehouse 7 years ago
parent
commit
2c5b721161
  1. 43
      org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/InfoRefsServlet.java

43
org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/InfoRefsServlet.java

@ -74,29 +74,30 @@ class InfoRefsServlet extends HttpServlet {
rsp.setCharacterEncoding(Constants.CHARACTER_ENCODING); rsp.setCharacterEncoding(Constants.CHARACTER_ENCODING);
final Repository db = getRepository(req); final Repository db = getRepository(req);
final OutputStreamWriter out = new OutputStreamWriter( try (OutputStreamWriter out = new OutputStreamWriter(
new SmartOutputStream(req, rsp, true), new SmartOutputStream(req, rsp, true),
Constants.CHARSET); Constants.CHARSET)) {
final RefAdvertiser adv = new RefAdvertiser() { final RefAdvertiser adv = new RefAdvertiser() {
@Override @Override
protected void writeOne(final CharSequence line) throws IOException { protected void writeOne(final CharSequence line)
// Whoever decided that info/refs should use a different throws IOException {
// delimiter than the native git:// protocol shouldn't // Whoever decided that info/refs should use a different
// be allowed to design this sort of stuff. :-( // delimiter than the native git:// protocol shouldn't
out.append(line.toString().replace(' ', '\t')); // be allowed to design this sort of stuff. :-(
} out.append(line.toString().replace(' ', '\t'));
}
@Override @Override
protected void end() { protected void end() {
// No end marker required for info/refs format. // No end marker required for info/refs format.
} }
}; };
adv.init(db); adv.init(db);
adv.setDerefTags(true); adv.setDerefTags(true);
Map<String, Ref> refs = db.getRefDatabase().getRefs(ALL); Map<String, Ref> refs = db.getRefDatabase().getRefs(ALL);
refs.remove(Constants.HEAD); refs.remove(Constants.HEAD);
adv.send(refs); adv.send(refs);
out.close(); }
} }
} }

Loading…
Cancel
Save