From dcf3e500744f85367a547cf85d118b06826a3fdc Mon Sep 17 00:00:00 2001 From: mka Date: Thu, 25 Oct 2012 07:34:57 +0000 Subject: [PATCH] NullPointerException situations are excluded --- .../Siman-Common/src/org/splat/dal/bo/kernel/User.java | 2 +- .../src/org/splat/service/StudyServiceImpl.java | 7 ++++++- Workspace/Siman-Common/src/org/splat/som/StudyRights.java | 5 ++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Workspace/Siman-Common/src/org/splat/dal/bo/kernel/User.java b/Workspace/Siman-Common/src/org/splat/dal/bo/kernel/User.java index 1494c37..41443f0 100644 --- a/Workspace/Siman-Common/src/org/splat/dal/bo/kernel/User.java +++ b/Workspace/Siman-Common/src/org/splat/dal/bo/kernel/User.java @@ -183,7 +183,7 @@ public class User extends Persistent implements Principal, Name { else if (item instanceof User) { User given = (User)item; if (isSaved()) return (this.getIndex() == given.getIndex()); - else return (this.username.equals(given.username)); // Usernames are unique + else return (given.username.equals(this.username)); // Usernames are unique } else { return false; } diff --git a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java index b9cd50e..aaf0249 100644 --- a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java +++ b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java @@ -857,8 +857,13 @@ public class StudyServiceImpl implements StudyService { * @see #getContributors() */ public boolean isStaffedBy(Study aStudy, User user) { - if (user == null) + if (user == null) { + return false; + } + if (aStudy == null) { return false; + } + if (aStudy.getAuthor() == null) return false; if (aStudy.getAuthor().equals(user)) return true; for (Iterator i = getContributors(aStudy).iterator(); i.hasNext();) { diff --git a/Workspace/Siman-Common/src/org/splat/som/StudyRights.java b/Workspace/Siman-Common/src/org/splat/som/StudyRights.java index f83bf9b..c4bf7f9 100644 --- a/Workspace/Siman-Common/src/org/splat/som/StudyRights.java +++ b/Workspace/Siman-Common/src/org/splat/som/StudyRights.java @@ -23,7 +23,10 @@ public class StudyRights { // ------------------------------------------- this.user = user; this.operand = study; - this.author = operand.getAuthor().equals(user); // user may be null + + if (operand != null && operand.getAuthor() != null) { + this.author = operand.getAuthor().equals(user); // user may be null + } } public StudyRights (Study study) { // -------------------------------- -- 2.39.2