From bf1793281219e5712f161d339e2cbde453a229b9 Mon Sep 17 00:00:00 2001 From: Jeremy Dubreil Date: Tue, 7 Feb 2017 17:54:18 -0800 Subject: [PATCH] [infer][java] remove the no-op model for Cursor.close() Summary: The diff remove the no-op model for `Cursor.close()` by the frontend-based `Closeable` as resources mechanism where every call of the form `object.close()` removes the file attribute on `object` when `object` is of type `Closeable`. Reviewed By: sblackshear Differential Revision: D4519386 fbshipit-source-id: 83633d4 --- infer/models/java/src/android/database/Cursor.java | 5 +---- infer/models/java/src/android/database/CursorWrapper.java | 6 +++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/infer/models/java/src/android/database/Cursor.java b/infer/models/java/src/android/database/Cursor.java index 2e2b1c927..ad36905fa 100644 --- a/infer/models/java/src/android/database/Cursor.java +++ b/infer/models/java/src/android/database/Cursor.java @@ -12,7 +12,4 @@ package android.database; import java.io.Closeable; -public interface Cursor extends Closeable { - - public void close(); -} +public interface Cursor extends Closeable {} diff --git a/infer/models/java/src/android/database/CursorWrapper.java b/infer/models/java/src/android/database/CursorWrapper.java index b5481fd98..d68f0538d 100644 --- a/infer/models/java/src/android/database/CursorWrapper.java +++ b/infer/models/java/src/android/database/CursorWrapper.java @@ -12,6 +12,8 @@ package android.database; import com.facebook.infer.builtins.InferUndefined; import com.facebook.infer.builtins.InferBuiltins; +import java.io.IOException; + public class CursorWrapper implements Cursor { protected final Cursor mCursor; @@ -20,7 +22,9 @@ public class CursorWrapper implements Cursor { } public void close() { - mCursor.close(); + try { + mCursor.close(); + } catch (IOException e) {} } }