diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CommonUtils.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CommonUtils.java index a116cf55542..d76ccbc2133 100644 --- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CommonUtils.java +++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CommonUtils.java @@ -139,8 +139,9 @@ static Architecture getValue() { public static String streamToString(InputStream is) { // Previous code was running into this: http://code.google.com/p/android/issues/detail?id=14562 // on Android 2.3.3. The below code below does not exhibit that problem. - final java.util.Scanner s = new java.util.Scanner(is).useDelimiter("\\A"); - return s.hasNext() ? s.next() : ""; + try (final java.util.Scanner s = new java.util.Scanner(is).useDelimiter("\\A")) { + return s.hasNext() ? s.next() : ""; + } } public static String sha1(String source) { diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java index da28e8708db..5a1322fc9b6 100644 --- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java +++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java @@ -661,15 +661,15 @@ private InputStream getResourceAsStream(String resource) { } private static byte[] readResource(InputStream is) throws IOException { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - byte[] buffer = new byte[1024]; - int length; + try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { + byte[] buffer = new byte[1024]; + int length; - while ((length = is.read(buffer)) != -1) { - out.write(buffer, 0, length); + while ((length = is.read(buffer)) != -1) { + out.write(buffer, 0, length); + } + return out.toByteArray(); } - - return out.toByteArray(); } private void finalizePreviousNativeSession(String previousSessionId) {