Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java
===================================================================
diff -u -re9d22ce99dd49f9fd9495c9e78a3306ee07a74b0 -rf4597fed13599ea6eb50d0c03a3d1ada415bdc2b
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java	(.../WhiteboardService.java)	(revision e9d22ce99dd49f9fd9495c9e78a3306ee07a74b0)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java	(.../WhiteboardService.java)	(revision f4597fed13599ea6eb50d0c03a3d1ada415bdc2b)
@@ -493,7 +493,8 @@
 	}
 	// using Whiteboard API from https://cloud13.de/testwhiteboard/apidoc/index.html
 	String whiteboardServerUrl = getWhiteboardServerUrl();
-	StringBuilder url = new StringBuilder().append(whiteboardServerUrl).append("/api/getReadOnlyWid?wid=").append(wid);
+	StringBuilder url = new StringBuilder().append(whiteboardServerUrl).append("/api/getReadOnlyWid?wid=")
+		.append(wid);
 	String whiteboardAccessToken = getWhiteboardAccessTokenHash(wid, null);
 	if (whiteboardAccessToken != null) {
 	    url.append("&at=").append(whiteboardAccessToken);
@@ -726,7 +727,6 @@
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
 	if (WhiteboardService.log.isDebugEnabled()) {
 	    WhiteboardService.log
@@ -764,14 +764,6 @@
 	Whiteboard whiteboard = whiteboardDao.getByContentId(toolContentId);
 	session.setWhiteboard(whiteboard);
 	whiteboardSessionDao.insert(session);
-
-	//create pad in a try-catch block so it doesn't affect session creation operation
-//	try {
-//	    createPad(whiteboard, session);
-//	} catch (Exception e) {
-//	    log.warn(e.getMessage(), e);
-//	}
-
     }
 
     @Override
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/LearningController.java
===================================================================
diff -u -re9d22ce99dd49f9fd9495c9e78a3306ee07a74b0 -rf4597fed13599ea6eb50d0c03a3d1ada415bdc2b
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/LearningController.java	(.../LearningController.java)	(revision e9d22ce99dd49f9fd9495c9e78a3306ee07a74b0)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/LearningController.java	(.../LearningController.java)	(revision f4597fed13599ea6eb50d0c03a3d1ada415bdc2b)
@@ -246,23 +246,19 @@
 
 	Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 
-	// boolean isLeaderResponseFinalized = whiteboardService.isLeaderResponseFinalized(toolSessionId);
+	WhiteboardSession session = whiteboardService.getWhiteboardSessionBySessionId(toolSessionId);
+	boolean isLeaderResponseFinalized = session != null && session.getGroupLeader() != null
+		&& session.getGroupLeader().isSessionFinished();
 
 	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
-	// responseJSON.put(WhiteboardConstants.ATTR_IS_LEADER_RESPONSE_FINALIZED, isLeaderResponseFinalized);
+	responseJSON.put(WhiteboardConstants.ATTR_IS_LEADER_RESPONSE_FINALIZED, isLeaderResponseFinalized);
 	response.setContentType("application/json;charset=utf-8");
 	response.getWriter().print(responseJSON);
 	return responseJSON.toString();
     }
 
     /**
      * Finish learning session.
-     *
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
      */
     @RequestMapping("/finish")
     private String finish(HttpServletRequest request) {
@@ -281,7 +277,7 @@
 	try {
 	    HttpSession ss = SessionManager.getSession();
 	    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-	    Long userID = new Long(user.getUserID().longValue());
+	    Long userID = user.getUserID().longValue();
 
 	    nextActivityUrl = whiteboardService.finishToolSession(sessionId, userID);
 	    request.setAttribute(WhiteboardConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl);