Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
===================================================================
diff -u -r154b350b57ebb41194f828c02d4a5f1a1b9d3242 -r7aa4fea830bd0c35d613c9755aac9c74e665329d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	(.../IQaService.java)	(revision 154b350b57ebb41194f828c02d4a5f1a1b9d3242)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	(.../IQaService.java)	(revision 7aa4fea830bd0c35d613c9755aac9c74e665329d)
@@ -179,15 +179,15 @@
     public void createToolSession(Long toolSessionId, Long toolContentId) throws ToolException;
     
     /**
-     * leaveToolSession(Long toolSessionId, User learner) should ideally should not be part this interface as it is
+     * leaveToolSession(Long toolSessionId, Long learnerId) should ideally should not be part this interface as it is
      * already part of the interface ToolSessionManager. It is here for development purposes.
      * 
      * It is also defined here since in development we want to be able call it directly from our web-layer 
      * instead of it being called by the container.
      * @param toolSessionId
      * @param toolContentId
      */
-    public String leaveToolSession(Long toolSessionId,User learner) throws DataMissingException, ToolException;
+    public String leaveToolSession(Long toolSessionId,Long learnerId) throws DataMissingException, ToolException;
     
     public BasicToolVO getToolBySignature(String toolSignature);
     
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r154b350b57ebb41194f828c02d4a5f1a1b9d3242 -r7aa4fea830bd0c35d613c9755aac9c74e665329d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 154b350b57ebb41194f828c02d4a5f1a1b9d3242)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 7aa4fea830bd0c35d613c9755aac9c74e665329d)
@@ -40,6 +40,7 @@
 import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
 import org.lamsfoundation.lams.contentrepository.service.RepositoryProxy;
 import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
+import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.tool.BasicToolVO;
 import org.lamsfoundation.lams.tool.ToolContentManager;
@@ -110,6 +111,7 @@
     
     private IUserManagementService userManagementService;
     private ILamsToolService toolService;
+    private ILearnerService learnerService;
 
     public void configureContentRepository() throws QaApplicationException {
     	logger.debug("retrieved repService: " + repositoryService);
@@ -1319,31 +1321,28 @@
      * Call controller service to complete the qa session
      * 
      */
-    public String leaveToolSession(Long toolSessionId,User learner) throws DataMissingException, ToolException 
+    public String leaveToolSession(Long toolSessionId,Long learnerId) throws DataMissingException, ToolException 
     {
         logger.debug("start of leaveToolSession with toolSessionId:" + toolSessionId);
-        logger.debug("start of leaveToolSession with learner:" + learner);
+        logger.debug("start of leaveToolSession with learnerId:" + learnerId);
         
         if (toolSessionId == null)
     	{
     		logger.debug("toolSessionId is null");
     		throw new DataMissingException("toolSessionId is missing");
     	}
         
-        if (learner == null)
+        if (learnerId == null)
     	{
-    		logger.debug("learner is null");
-    		throw new DataMissingException("learner is missing");
+    		logger.debug("learnerId is null");
+    		throw new DataMissingException("learnerId is missing");
     	}
         
     	try
 		{
-    		/*
-    		String nextUrl=learnerService.completeToolSession(toolSessionId,learner);
+    		String nextUrl = learnerService.completeToolSession(toolSessionId,learnerId);
     		logger.debug(logger + " " + this.getClass().getName() +  " " + "nextUrl: " + nextUrl);
     		return nextUrl;
-    		*/
-    		return "nextUrl";
     	}
     	catch(DataAccessException e)
 		{
@@ -1613,4 +1612,14 @@
 	public IUserManagementService getUserManagementService() {
 		return userManagementService;
 	}
+
+
+	public ILearnerService getLearnerService() {
+		return learnerService;
+	}
+
+
+	public void setLearnerService(ILearnerService learnerService) {
+		this.learnerService = learnerService;
+	}
 }