Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java =================================================================== diff -u -r0fb4d41712e31bd525abb02f100373875b1c7fc6 -r2f18edf42c26f541a6270cac2dd1d5b2455fda91 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision 0fb4d41712e31bd525abb02f100373875b1c7fc6) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision 2f18edf42c26f541a6270cac2dd1d5b2455fda91) @@ -426,14 +426,22 @@ if (qaContent.getTitle() == null) { qaGeneralAuthoringDTO.setActivityTitle("Q&A Title"); - qaGeneralAuthoringDTO.setActivityInstructions("Q&A Instructions"); } else { qaGeneralAuthoringDTO.setActivityTitle(qaContent.getTitle()); + } + + + if (qaContent.getInstructions() == null) + { + qaGeneralAuthoringDTO.setActivityInstructions("Q&A Instructions"); + } + else + { qaGeneralAuthoringDTO.setActivityInstructions( qaContent.getInstructions()); - } + sessionMap.put(ACTIVITY_TITLE_KEY, qaGeneralAuthoringDTO.getActivityTitle()); sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, qaGeneralAuthoringDTO.getActivityInstructions());