From 317b0833ef66ac1e97c72e9bbea706eddf549f5d Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Sat, 19 Nov 2011 20:46:34 +0000
Subject: Prevent Group.equals tests throwing a NullPointerException for
 GlobalGroups.

---
 .../src/org/anjocaido/groupmanager/data/DataUnit.java                 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
index 6f2fdd3b3..8ae272328 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
@@ -39,7 +39,9 @@ public abstract class DataUnit {
     public boolean equals(Object o) {
         if (o instanceof DataUnit) {
             DataUnit go = (DataUnit) o;
-            if (this.getName().equalsIgnoreCase(go.getName()) && this.dataSource.getName().equalsIgnoreCase(go.getDataSource().getName())) {
+            if (this.getName().equalsIgnoreCase(go.getName())
+            		&& ((this.dataSource == null && go.getDataSource() == null)
+            		|| (this.dataSource.getName().equalsIgnoreCase(go.getDataSource().getName())))) {
                 return true;
             }
         }
-- 
cgit v1.2.3