NullPointerException situations are excluded

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 1494c37ee46cf7b022190dcc44372709fe2a3a73..41443f075a467a1a00884e7f12edc725620ac6f6 100644 (file)
--- 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 b9cd50e7269971c9be4d47152530775acdcccec9..aaf0249d217d2fd9c4cc5251aefa7c0cbdbe137d 100644 (file)
--- 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<User> 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 f83bf9b67f63bfadc3df804f7de9925afc360dfe..c4bf7f954df64b8fb91f772f224900f61782ee00 100644 (file)
--- 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) {
 //  --------------------------------