Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v
diff -u -r1.73 -r1.74
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	23 Sep 2006 19:11:10 -0000	1.73
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	12 Oct 2006 12:54:33 -0000	1.74
@@ -32,7 +32,6 @@
 	public static final String MY_SIGNATURE 							="laqa11";
 	public static final long   DEFAULT_CONTENT_ID 						=0;
     public static final long   DEFAULT_QUE_CONTENT_ID 					=1;
-	//public static final String TOOL_SERVICE								="tool_service";
 	public static final String ERROR_QAAPPLICATION 						= "error.exception.QaApplication";
 	public static final String TOOL_CONTENT_ID 							= "toolContentID";
 	public static final String MAP_QUESTION_CONTENT_KEY					= "mapQuestionContentKey";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java,v
diff -u -r1.35 -r1.36
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	10 Oct 2006 16:16:51 -0000	1.35
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	12 Oct 2006 12:54:33 -0000	1.36
@@ -117,7 +117,11 @@
     	    		 *  add the question to the questions Map in the displayOrder
     	    		 */
             		mapQuestions.put(new Integer(displayOrder).toString(),qaQueContent.getQuestion());
-            		mapFeedback.put(new Integer(displayOrder).toString(),qaQueContent.getFeedback());
+            		
+            		String feedback=qaQueContent.getFeedback();
+            		logger.debug("feedback: " + feedback);
+            		
+            		mapFeedback.put(new Integer(displayOrder).toString(), feedback.trim());
         		}
     		}
     	}
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.16 -r1.17
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	28 Sep 2006 23:30:58 -0000	1.16
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	12 Oct 2006 12:54:33 -0000	1.17
@@ -107,18 +107,20 @@
 									
 
 				  			  		<c:forEach var="feedbackEntry" items="${generalLearnerFlowDTO.mapFeedback}">
-										<c:if test="${feedbackEntry.key == questionEntry.key}"> 						  			  		
-										  <tr>
-											<td colspan=2> <b> <bean:message key="label.feedback"/>:  </b>  
-										  	</td>
-										  </tr>
-										  
-										  <tr>
-											<td colspan=2> 
-												  <c:out value="${feedbackEntry.value}" escapeXml="false"/>						  																	
-										  	</td>
-										  </tr>
-									  	</c:if> 				    
+										<c:if test="${(feedbackEntry.value != '') && (feedbackEntry.value != null) }"> 						  			  		
+					  			  			<c:if test="${feedbackEntry.key == questionEntry.key}"> 						  			  		
+											  <tr>
+												<td colspan=2> <b> <bean:message key="label.feedback"/>:  </b>  
+											  	</td>
+											  </tr>
+											  
+											  <tr>
+												<td colspan=2> 
+													  <c:out value="${feedbackEntry.value}" escapeXml="false"/>						  																	
+											  	</td>
+											  </tr>
+										  	</c:if> 				    
+									  	</c:if> 				    										  	
 									</c:forEach>