Avoid NPE instead of catching it

09819e28 · Geoffrey Métais · 6fbe1773 · 09819e28
Commit 09819e28 authored Feb 18, 2015 by Geoffrey Métais
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 7 deletions

vlc-android/src/org/videolan/vlc/util/Util.java vlc-android/src/org/videolan/vlc/util/Util.java +10 -7

No files found.
--- a/vlc-android/src/org/videolan/vlc/util/Util.java
+++ b/vlc-android/src/org/videolan/vlc/util/Util.java
@@ -282,12 +282,15 @@ public class Util {
    }

    public static boolean close(Closeable closeable) {
-        try {
-            closeable.close();
-            return true;
-        } catch (IOException e) {
-            return false;
-        } catch (NullPointerException e) {
-            return false;}
+        if (closeable != null) {
+            try {
+                closeable.close();
+                return true;
+            } catch (IOException e) {
+                return false;
+            }
+        } else {
+                return false;
+        }
    }
 }