DASH-324 deal with NullPointerException when related assignment, anno…

…uncement channel or user was removed git-svn-id: https://source.sakaiproject.org/svn/dashboard/trunk@315050 66ffb92e-73f9-0310-93c1-f5514f145a0a
marktriggs · Oct 31, 2014 · 70d4d44 · 70d4d44
1 parent f5d7b87
commit 70d4d44
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/dashboard/impl/src/java/org/sakaiproject/dash/entity/AnnouncementSupport.java b/dashboard/impl/src/java/org/sakaiproject/dash/entity/AnnouncementSupport.java
@@ -349,6 +349,10 @@ public boolean isAvailable(String entityReference) {
 			{
 				String channelId = getChannelIdFromReference(entityReference);
 				AnnouncementChannel channel = (AnnouncementChannel) announcementService.getChannel(channelId);
+
+				// return false if channel does not exist
+				if (channel == null) return false;
+
 				String siteId = channel.getContext();
 				if (!dashboardLogic.MOTD_CONTEXT.equals(siteId) && !sakaiProxy.isSitePublished(siteId))
 				{

diff --git a/dashboard/impl/src/java/org/sakaiproject/dash/entity/AssignmentSupport.java b/dashboard/impl/src/java/org/sakaiproject/dash/entity/AssignmentSupport.java
@@ -283,6 +283,10 @@ public void init() {
 
 		public boolean isAvailable(String entityReference) {
 			Assignment assn = (Assignment) sakaiProxy.getEntity(entityReference);
+
+			// return false if the assignment is no longer available
+			if (assn == null) return false;
+
 			String siteId = assn.getContext();
 			if (!sakaiProxy.isSitePublished(siteId))
 			{

diff --git a/dashboard/impl/src/java/org/sakaiproject/dash/logic/DashboardLogicImpl.java b/dashboard/impl/src/java/org/sakaiproject/dash/logic/DashboardLogicImpl.java
@@ -1145,9 +1145,12 @@ protected Person getOrCreatePerson(String sakaiId) {
 		Person person = dao.getPersonBySakaiId(sakaiId);
 		if(person == null) {
 			User userObj = this.sakaiProxy.getUser(sakaiId);
-			person = new Person(sakaiId, userObj.getEid());
-			dao.addPerson(person);
-			person = dao.getPersonBySakaiId(sakaiId);
+			if (userObj != null)
+			{
+				person = new Person(sakaiId, userObj.getEid());
+				dao.addPerson(person);
+				person = dao.getPersonBySakaiId(sakaiId);
+			}
 		}
 		return person;
 	}