Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java,v diff -u -r1.2 -r1.3 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java 29 Jul 2015 21:02:55 -0000 1.2 +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java 3 Sep 2015 00:29:58 -0000 1.3 @@ -26,6 +26,7 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; +import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; /** @@ -53,8 +54,8 @@ public PeerreviewUser() { } - public PeerreviewUser(UserDTO user, PeerreviewSession session) { - this.userId = new Long(user.getUserID().intValue()); + public PeerreviewUser(User user, PeerreviewSession session) { + this.userId = new Long(user.getUserId()); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.loginName = user.getLogin(); Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java,v diff -u -r1.5 -r1.6 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java 31 Aug 2015 12:43:19 -0000 1.5 +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java 3 Sep 2015 00:29:58 -0000 1.6 @@ -325,7 +325,7 @@ log.debug("Peer Review: Processing session " + toolSessionId); long start = System.currentTimeMillis(); - ArrayList userIdsAdded = new ArrayList(); + int usersAdded = 0; PeerreviewSession session = getPeerreviewSessionBySessionId(toolSessionId); Set lessonUsers = toolService.getUsersFromGroupingActivity(toolSessionId); @@ -337,15 +337,14 @@ for (User lessonUser : lessonUsers) { currentUser = lessonUser; if (!sessionUserIds.contains(lessonUser.getUserId().longValue())) { - PeerreviewUser newUser = new PeerreviewUser(lessonUser.getUserDTO(), session); - createUser(newUser); - userIdsAdded.add(lessonUser.getUserId()); + createUser(new PeerreviewUser(lessonUser, session)); + usersAdded++; } } } - log.debug("Peer Review UserCreateThread " + toolSessionId + ": Update Took " - + (System.currentTimeMillis() - start) + "ms. Added " + userIdsAdded.size()); + log.debug("Peer Review UserCreateThread " + toolSessionId + ": Update needsUpdate "+needsUpdate+" took: " + + (System.currentTimeMillis() - start) + "ms. Added " + usersAdded); creatingUsersForSessionIds.remove(toolSessionId); return true; } catch (Throwable e) {