commit 7d83d35e2157015342b9f19998488fcdb0a39544
author David Pursehouse <david.pursehouse@sonymobile.com> Fri Oct 23 17:40:10 2015 +0900
committer Luca Milanesio <luca.milanesio@gmail.com> Sun Oct 25 15:08:48 2015 +0000
tree 2dc4d11c15285ea9660d6212e80c5a7c58752f3d
parent 4ca0b13552fde15d48d4e3d459eab1404dc57082

WebhookServlet: Open BufferedReader in try-with-resource

Change-Id: I0ab79fc08c0856972bfbfed26af24f83976e24eb

github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/notification/WebhookServlet.java

diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/notification/WebhookServlet.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/notification/WebhookServlet.java
index fa746e2..3d7f819 100644
--- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/notification/WebhookServlet.java
+++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/notification/WebhookServlet.java
@@ -153,30 +153,31 @@
       return;
     }
 
-    BufferedReader reader = req.getReader();
-    String body = Joiner.on("\n").join(CharStreams.readLines(reader));
-    if (!validateSignature(req.getHeader("X-Hub-Signature"), body,
-        req.getCharacterEncoding())) {
-      logger.error("Signature mismatch to the payload");
-      resp.sendError(SC_FORBIDDEN);
-      return;
-    }
+    try (BufferedReader reader = req.getReader()) {
+      String body = Joiner.on("\n").join(CharStreams.readLines(reader));
+      if (!validateSignature(req.getHeader("X-Hub-Signature"), body,
+          req.getCharacterEncoding())) {
+        logger.error("Signature mismatch to the payload");
+        resp.sendError(SC_FORBIDDEN);
+        return;
+      }
 
-    session.get().setUserAccountId(Account.Id.fromRef(config.webhookUser));
-    GitHubLogin login = loginProvider.get(config.webhookUser);
-    if (login == null || !login.isLoggedIn()) {
-      logger.error(
-          "Cannot login to github as {}. {}.webhookUser is not correctly configured?",
-          config.webhookUser, GitHubConfig.CONF_SECTION);
-      resp.setStatus(SC_INTERNAL_SERVER_ERROR);
-      return;
-    }
-    requestScopedLoginProvider.get(req).login(login.getToken());
+      session.get().setUserAccountId(Account.Id.fromRef(config.webhookUser));
+      GitHubLogin login = loginProvider.get(config.webhookUser);
+      if (login == null || !login.isLoggedIn()) {
+        logger.error(
+            "Cannot login to github as {}. {}.webhookUser is not correctly configured?",
+            config.webhookUser, GitHubConfig.CONF_SECTION);
+        resp.setStatus(SC_INTERNAL_SERVER_ERROR);
+        return;
+      }
+      requestScopedLoginProvider.get(req).login(login.getToken());
 
-    if (callHander(handler, body)) {
-      resp.setStatus(SC_NO_CONTENT);
-    } else {
-      resp.sendError(SC_INTERNAL_SERVER_ERROR);
+      if (callHander(handler, body)) {
+        resp.setStatus(SC_NO_CONTENT);
+      } else {
+        resp.sendError(SC_INTERNAL_SERVER_ERROR);
+      }
     }
   }