From 00ef45c1e3a4da1a1a64f0a11d833f9f504137ac Mon Sep 17 00:00:00 2001 From: Lennart Rosam Date: Fri, 25 May 2012 02:56:23 +0200 Subject: [PATCH] Make equals() more robust --- src/eu/alefzero/owncloud/datamodel/OCFile.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/eu/alefzero/owncloud/datamodel/OCFile.java b/src/eu/alefzero/owncloud/datamodel/OCFile.java index 336f95c3..68619337 100644 --- a/src/eu/alefzero/owncloud/datamodel/OCFile.java +++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java @@ -334,8 +334,14 @@ public class OCFile implements Parcelable, Comparable { } public boolean equals(Object o) { - OCFile that = (OCFile) o; - return this.mId == that.mId; + if(o instanceof OCFile){ + OCFile that = (OCFile) o; + if(that != null){ + return this.mId == that.mId; + } + } + + return false; } @Override -- 2.11.0