From a894b51ccd4926f1ed45a8185e2dc0e406e8a6eb Mon Sep 17 00:00:00 2001
From: Alexandre Philbert <alexandre.philbert@hotmail.com>
Date: Sun, 15 Apr 2018 20:23:12 -0400
Subject: [PATCH] Use try with resource in DelegatingClassLoader

Change-Id: I7cc08ad9cf0516a00d658e9f32f178401a6bb271
---
 .../server/plugins/DelegatingClassLoader.java    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/java/com/google/gerrit/server/plugins/DelegatingClassLoader.java b/java/com/google/gerrit/server/plugins/DelegatingClassLoader.java
index daee9c7afd..32adb9c8e1 100644
--- a/java/com/google/gerrit/server/plugins/DelegatingClassLoader.java
+++ b/java/com/google/gerrit/server/plugins/DelegatingClassLoader.java
@@ -31,13 +31,17 @@ public class DelegatingClassLoader extends ClassLoader {
   @Override
   public Class<?> findClass(String name) throws ClassNotFoundException {
     String path = name.replace('.', '/') + ".class";
-    InputStream resource = target.getResourceAsStream(path);
-    if (resource != null) {
-      try {
-        byte[] bytes = ByteStreams.toByteArray(resource);
-        return defineClass(name, bytes, 0, bytes.length);
-      } catch (IOException e) {
+    try (InputStream resource = target.getResourceAsStream(path)) {
+      if (resource != null) {
+        try {
+          byte[] bytes = ByteStreams.toByteArray(resource);
+          return defineClass(name, bytes, 0, bytes.length);
+        } catch (IOException e) {
+          // throws ClassNotFoundException later
+        }
       }
+    } catch (IOException e) {
+      // throws ClassNotFoundException later
     }
     throw new ClassNotFoundException(name);
   }