SAK-40697 - NPE When accessing forums from Lessons (sakaiproject#6065)

rifqioe · Oct 1, 2018 · 7e4e1f9 · 7e4e1f9
1 parent 9db92b8
commit 7e4e1f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/forum/dfForumDirect.jsp b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/forum/dfForumDirect.jsp
@@ -9,9 +9,7 @@
 <%
 
   FacesContext context = FacesContext.getCurrentInstance();
-  Application app = context.getApplication();
-  ValueBinding binding = app.createValueBinding("#{ForumTool}");
-  DiscussionForumTool forumTool = (DiscussionForumTool) binding.getValue(context);
+  DiscussionForumTool forumTool = context.getApplication().evaluateExpressionGet(context, "#{ForumTool}", DiscussionForumTool.class);
 
   String target = "";
 
@@ -29,7 +27,7 @@
     }
   }
 
-  target = "/jsp/discussionForum/forum/dfForumDetail.jsf?forumId="
+  target = "/jsp/discussionForum/forum/dfForumDetail.jsp?forumId="
   	       + request.getParameter("forumId");
   forumTool.processActionDisplayForum();
 

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfAllMessagesDirect.jsp b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfAllMessagesDirect.jsp
@@ -9,9 +9,7 @@
 <%
 
   FacesContext context = FacesContext.getCurrentInstance();
-  Application app = context.getApplication();
-  ValueBinding binding = app.createValueBinding("#{ForumTool}");
-  DiscussionForumTool forumTool = (DiscussionForumTool) binding.getValue(context);
+  DiscussionForumTool forumTool = context.getApplication().evaluateExpressionGet(context, "#{ForumTool}", DiscussionForumTool.class);
 
   String target = "";
 
@@ -31,7 +29,7 @@
   }
 
 if(forumTool.getHasTopicAccessPrivileges(request.getParameter("topicId"))){
-  target = "/jsp/discussionForum/message/dfAllMessages.jsf?topicId="
+  target = "/jsp/discussionForum/message/dfAllMessages.jsp?topicId="
   	       + request.getParameter("topicId");
 
   forumTool.processActionDisplayTopic();
@@ -49,7 +47,7 @@ if(forumTool.getHasTopicAccessPrivileges(request.getParameter("topicId"))){
 	if(request.getParameter("topicId") == null) {
 		// If we're in here it means we have lost topicId. We should direct
 		// them to the topic's parent forum which will then render the topic.
-		target = "/jsp/discussionForum/message/dfAllMessages.jsf?forumId="
+		target = "/jsp/discussionForum/message/dfAllMessages.jsp?forumId="
   	       		+ request.getParameter("forumId");
 
 		  forumTool.processActionDisplayForum();