From: Lennart Rosam <lennart@familie-rosam.de>
Date: Fri, 25 May 2012 00:56:23 +0000 (+0200)
Subject: Make equals() more robust
X-Git-Tag: oc-android-1.4.3~386
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/00ef45c1e3a4da1a1a64f0a11d833f9f504137ac?ds=sidebyside

Make equals() more robust
---

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<OCFile> {
     }
 
     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