From e028046b4316244b571c75bf88a55238c88629da Mon Sep 17 00:00:00 2001
From: Christos Stathis <chstath@ebs.gr>
Date: Wed, 27 Jun 2012 18:17:23 +0300
Subject: [PATCH] Fixed a NPE

---
 src/gr/grnet/pithos/web/client/foldertree/Folder.java |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gr/grnet/pithos/web/client/foldertree/Folder.java b/src/gr/grnet/pithos/web/client/foldertree/Folder.java
index 7f6b4a9..5ce0b72 100644
--- a/src/gr/grnet/pithos/web/client/foldertree/Folder.java
+++ b/src/gr/grnet/pithos/web/client/foldertree/Folder.java
@@ -246,7 +246,8 @@ public class Folder extends Resource {
     public boolean equals(Object other) {
         if (other instanceof Folder) {
             Folder o = (Folder) other;
-            return owner.equals(o.getOwner()) && getUri().equals(o.getUri());
+            return (owner == null ? true : owner.equals(o.getOwner())) 
+            		&& (getUri().equals(o.getUri()));
         }
         return false;
     }
-- 
1.7.10.4