coderabbitai suggestions

Author: ern

msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java

@@ -1647,7 +1647,7 @@ private boolean needToUpdateSynopticOnForumSave(Object target, boolean isDraft){
 	  boolean isDraftOld = false;
 	  boolean availabilityChanged = false;
 
-	  Set oldMembershipItemSet = null;
+	  Set<DBMembershipItem> oldMembershipItemSet = null;
 
 	  if (target instanceof DiscussionForum){
 		  DiscussionForum forum = ((DiscussionForum) target);
@@ -1691,23 +1691,25 @@ else if (target instanceof Topic){
 		        	update = true;
 		        	break;
 		        }
-		        
-		        Iterator iter2 = oldMembershipItemSet.iterator();
-				while(iter2.hasNext())
-				{
-					DBMembershipItem oldItem = (DBMembershipItem) iter2.next();
-					if(permBean.getItem().getId().equals(oldItem.getId())){
-						PermissionLevel oldLevel = oldItem.getPermissionLevel();
-						if (oldLevel == null) {
-							oldLevel = permissionLevelManager.getPermissionLevelByName(oldItem.getPermissionLevelName());
-						}
-						Boolean oldModerate = (oldLevel != null) ? oldLevel.getModeratePostings() : Boolean.FALSE;
-						if(permBean.getModeratePostings() != Boolean.TRUE.equals(oldModerate)){
-							update = true;
-							break;
-						}
-					}
-				}
+
+                  for (DBMembershipItem oldItem : oldMembershipItemSet) {
+                      if (permBean.getItem().getId().equals(oldItem.getId())) {
+                          PermissionLevel oldLevel = oldItem.getPermissionLevel();
+                          if (oldLevel == null) {
+                              if (PermissionLevelManager.PERMISSION_LEVEL_NAME_CUSTOM.equals(oldItem.getPermissionLevelName())) {
+                                  // Custom item with no stored level — permissions are unknown, treat as changed
+                                  update = true;
+                                  break;
+                              }
+                              oldLevel = permissionLevelManager.getPermissionLevelByName(oldItem.getPermissionLevelName());
+                          }
+                          Boolean oldModerate = (oldLevel != null) ? oldLevel.getModeratePostings() : Boolean.FALSE;
+                          if (permBean.getModeratePostings() != Boolean.TRUE.equals(oldModerate)) {
+                              update = true;
+                              break;
+                          }
+                      }
+                  }
 				if(update){
 					break;
 				}

msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/ui/PermissionBean.java

@@ -78,12 +78,15 @@ private void setPermissionsForLevel(String selectedLevel)
     {
       if (!"Custom".equals(selectedLevel))
       {
-        this.displayLevel = permissionLevelManager.getPermissionLevelByName(selectedLevel);
+        PermissionLevel level = permissionLevelManager.getPermissionLevelByName(selectedLevel);
+        if (level != null) {
+          this.displayLevel = level;
+        }
       }
       else
       {
         MessageForumsTypeManager typeManager = (MessageForumsTypeManager) ComponentManager.get("org.sakaiproject.api.app.messageforums.MessageForumsTypeManager");
-        if (this.displayLevel == null || !this.displayLevel.getTypeUuid().equals(typeManager.getCustomLevelType()))
+        if (this.displayLevel == null || !typeManager.getCustomLevelType().equals(this.displayLevel.getTypeUuid()))
         {
           this.displayLevel = permissionLevelManager.createPermissionLevel(selectedLevel, typeManager.getCustomLevelType(), new PermissionsMask());
         }