Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v
diff -u -r1.98 -r1.99
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	5 Sep 2007 08:06:52 -0000	1.98
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	10 Sep 2007 04:25:07 -0000	1.99
@@ -1825,7 +1825,8 @@
 		
 		TreeMap<String,ToolOutput> output = new TreeMap<String, ToolOutput>();
 		if ( names == null || names.contains(MCOutputDefinitionFactory.OUTPUT_NAME_LEARNER_MARK) ) {
-			McQueUsr queUser = getMcUserBySession(learnerId, toolSessionId);
+			McSession session = findMcSessionById(toolSessionId);
+			McQueUsr queUser = getMcUserBySession(learnerId, session.getUid());
 			Long mark = queUser != null ? queUser.getLastAttemptTotalMark() : new Long(0);
 			ToolOutput toolOutput = new ToolOutput(MCOutputDefinitionFactory.OUTPUT_NAME_LEARNER_MARK, 
 					MCOutputDefinitionFactory.OUTPUT_NAME_LEARNER_MARK, mark);
@@ -1841,7 +1842,8 @@
 	public ToolOutput getToolOutput(String name, Long toolSessionId,
 			Long learnerId) {
 		if ( name != null && name.equals(MCOutputDefinitionFactory.OUTPUT_NAME_LEARNER_MARK) ) {
-			McQueUsr queUser = getMcUserBySession(learnerId, toolSessionId);
+			McSession session = findMcSessionById(toolSessionId);
+			McQueUsr queUser = getMcUserBySession(learnerId, session.getUid());
 			Long mark = queUser != null ? queUser.getLastAttemptTotalMark() : new Long(0);
 			return new ToolOutput(MCOutputDefinitionFactory.OUTPUT_NAME_LEARNER_MARK, 
 					MCOutputDefinitionFactory.OUTPUT_NAME_LEARNER_MARK, mark);