Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java,v
diff -u -r1.14.6.7 -r1.14.6.8
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	29 Sep 2011 13:43:36 -0000	1.14.6.7
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	30 Sep 2011 15:51:52 -0000	1.14.6.8
@@ -29,7 +29,9 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
@@ -150,25 +152,30 @@
 	}
 
 	Assessment assessment = service.getAssessmentBySessionId(toolSessionId);
+	Set<QuestionReference> questionReferences = new TreeSet<QuestionReference>(new SequencableComparator());
+	questionReferences.addAll(assessment.getQuestionReferences());
+	HashMap<Long, AssessmentQuestion> questionToReferenceMap = new HashMap<Long, AssessmentQuestion>();
+	ArrayList<AssessmentQuestion> takenQuestion = new ArrayList<AssessmentQuestion>();
 	
-	
-	Set<QuestionReference> questionReferences = assessment.getQuestionReferences();
-	Set<AssessmentQuestion> questionsFromDB = new LinkedHashSet<AssessmentQuestion>();
 	//add non-random questions
 	for (QuestionReference questionReference : questionReferences) {
 	    if (!questionReference.isRandomQuestion()) {
-		questionsFromDB.add(questionReference.getQuestion());
+		AssessmentQuestion question = questionReference.getQuestion();
+		takenQuestion.add(question);
+		questionToReferenceMap.put(questionReference.getUid(), question);
 	    }
 	}
+	
 	Set<AssessmentQuestion> allQuestions = assessment.getQuestions();
-	Collection<AssessmentQuestion> availableQuestions = CollectionUtils.subtract(allQuestions, questionsFromDB);
+	Collection<AssessmentQuestion> availableQuestions = CollectionUtils.subtract(allQuestions, takenQuestion);
 	//add random questions (actually replacing them with real ones)
 	for (QuestionReference questionReference : questionReferences) {
 	    if (questionReference.isRandomQuestion()) {
 		//pick a random element
 		Random rand = new Random(System.currentTimeMillis());
 		AssessmentQuestion question = (AssessmentQuestion) availableQuestions.toArray()[rand.nextInt(availableQuestions.size())];
-		questionsFromDB.add(question);
+		takenQuestion.add(question);
+		questionToReferenceMap.put(questionReference.getUid(), question);
 		availableQuestions.remove(question);
 	    }
 	}
@@ -225,24 +232,22 @@
 	    }
 	}
 	
-	Set<AssessmentQuestion> questionList = new TreeSet<AssessmentQuestion>(new SequencableComparator());
-	if (questionsFromDB != null) {
-	    // remove hidden questions.
-	    for (AssessmentQuestion question : questionsFromDB) {
-		// becuase in webpage will use this login name. Here is just
-		// initialize it to avoid session close error in proxy object.
-		if (question.getCreateBy() != null) {
-		    question.getCreateBy().getLoginName();
-		}
-		questionList.add(question);
+	//sort questions
+	LinkedList<AssessmentQuestion> questionList = new LinkedList<AssessmentQuestion>();
+	for (QuestionReference questionReference : questionReferences) {
+	    AssessmentQuestion question = questionToReferenceMap.get(questionReference.getUid());
+	    // becuase in webpage will use this login name. Here is just initialize it to avoid session close error in proxy object.
+	    if (question.getCreateBy() != null) {
+		question.getCreateBy().getLoginName();
 	    }
+	    questionList.add(question);
 	}
 
 	// shuffling
 	if (assessment.isShuffled()) {
 	    ArrayList<AssessmentQuestion> shuffledList = new ArrayList<AssessmentQuestion>(questionList);
 	    Collections.shuffle(shuffledList);
-	    questionList = new LinkedHashSet<AssessmentQuestion>(shuffledList);
+	    questionList = new LinkedList<AssessmentQuestion>(shuffledList);
 	}
 	for (AssessmentQuestion question : questionList) {
 	    if (question.isShuffle() || (question.getType() == AssessmentConstants.QUESTION_TYPE_ORDERING)) {