Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
===================================================================
diff -u -r1ba40605c8e5fff683288c9c72f5ab2a981ba98a -r0b0204c5d68cb94fbcdae15199580c7a78e42d52
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	(.../LessonDAO.java)	(revision 1ba40605c8e5fff683288c9c72f5ab2a981ba98a)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	(.../LessonDAO.java)	(revision 0b0204c5d68cb94fbcdae15199580c7a78e42d52)
@@ -269,16 +269,16 @@
     }
 
     /**
-     * Get the lesson and activity ids that apply to the tool activity associated with this tool content id. 
+     * Get the lesson and activity ids that apply to the tool activity associated with this tool content id.
      * Returns an array of two longs.
      */
     @Override
     public Long[] getLessonActivityIdsForToolContentId(long toolContentId) {
 	Query query = getSession().createQuery(LessonDAO.FIND_LESSON_ACTIVITY_IDS_BY_TOOL_CONTENT_ID);
 	query.setLong("toolContentId", toolContentId);
 	List list = query.list();
-	
-	Long[] longArray = {null, null};
+
+	Long[] longArray = { null, null };
 	if (list.size() > 0) {
 	    Object[] objectArray = (Object[]) list.get(0);
 	    longArray = Arrays.copyOf(objectArray, objectArray.length, Long[].class);
@@ -388,10 +388,10 @@
 	List<Object[]> resultQuery = query.list();
 
 	// this map keeps the insertion order
-	Map<User, Boolean> result = new LinkedHashMap<User, Boolean>();
+	Map<User, Boolean> result = new LinkedHashMap<>();
 	// make the result easier to process
 	for (Object[] entry : resultQuery) {
-	    result.put((User) entry[0], ((Integer) entry[1]).equals(1));
+	    result.put((User) entry[0], ((Number) entry[1]).intValue() == 1);
 	}
 	return result;
     }
@@ -419,7 +419,8 @@
     @Override
     @SuppressWarnings("unchecked")
     public List<Long> getOrganisationLessons(Integer organisationId) {
-	Query<Long> query = getSession().createQuery(FIND_LESSON_IDS_BY_ORG_ID).setParameter("organisationId", organisationId);
+	Query<Long> query = getSession().createQuery(FIND_LESSON_IDS_BY_ORG_ID).setParameter("organisationId",
+		organisationId);
 	return query.list();
     }