Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v
diff -u -r1.111.2.2 -r1.111.2.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	12 Sep 2014 22:43:06 -0000	1.111.2.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	22 Sep 2014 13:57:01 -0000	1.111.2.3
@@ -538,6 +538,11 @@
 	    QaServicePOJO.logger.error("throwing ToolException: WARNING!, retrieved toContent is null.");
 	    throw new ToolException("WARNING! Fail to create toContent. Can't continue!");
 	} else {
+	    // save questions first, because if Hibernate decides to flush Conditions first,
+	    // there is no cascade to questions and it may trigger an error
+	    for (QaQueContent question : toContent.getQaQueContents()) {
+		qaQuestionDAO.saveOrUpdateQaQueContent(question);
+	    }
 	    qaDAO.saveQa(toContent);
 	}