diff options
| author | ElgarL <ElgarL@palmergames.com> | 2011-11-19 20:46:34 +0000 |
|---|---|---|
| committer | ElgarL <ElgarL@palmergames.com> | 2011-11-19 20:46:34 +0000 |
| commit | ed272e3feeb904bc79840d0207a40f57ad55c743 (patch) | |
| tree | 2fa1c023d626de48d3f1329aa3506d0ac9b86eb2 /EssentialsGroupManager/src/org/anjocaido/groupmanager/data | |
| parent | 50f07f4ad7e0ebca77a38b3ea4630443388cc2fa (diff) | |
| download | Essentials-ed272e3feeb904bc79840d0207a40f57ad55c743.tar Essentials-ed272e3feeb904bc79840d0207a40f57ad55c743.tar.gz Essentials-ed272e3feeb904bc79840d0207a40f57ad55c743.tar.lz Essentials-ed272e3feeb904bc79840d0207a40f57ad55c743.tar.xz Essentials-ed272e3feeb904bc79840d0207a40f57ad55c743.zip | |
Prevent Group.equals tests throwing a NullPointerException for
GlobalGroups.
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/data')
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java | 4 |
1 files changed, 3 insertions, 1 deletions
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; } } |