Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml =================================================================== diff -u -r4723715bee4472a5a41fc2cafd690b23b7ae4e2a -r59a2ca17628a2069a961676d18302c936138c53c --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml (.../chatApplicationContext.xml) (revision 4723715bee4472a5a41fc2cafd690b23b7ae4e2a) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml (.../chatApplicationContext.xml) (revision 59a2ca17628a2069a961676d18302c936138c53c) @@ -57,7 +57,10 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED - + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java =================================================================== diff -u -r08afbd42add64dcb44f8accb9595bd125bd9ebae -r59a2ca17628a2069a961676d18302c936138c53c --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision 08afbd42add64dcb44f8accb9595bd125bd9ebae) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision 59a2ca17628a2069a961676d18302c936138c53c) @@ -1092,16 +1092,16 @@ /** * Import the data for a 1.0.2 Chat */ - public void import102ToolContent(Long toolContentId, Integer newUserId, Hashtable importValues) + public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { Date now = new Date(); Chat toolContentObj = new Chat(); toolContentObj.setContentInUse(Boolean.FALSE); - toolContentObj.setCreateBy(newUserId != null ? new Long(newUserId.longValue()) : null); + toolContentObj.setCreateBy(new Long(user.getUserID().longValue())); toolContentObj.setCreateDate(now); toolContentObj.setDefineLater(Boolean.FALSE); toolContentObj.setFilterKeywords(null); - toolContentObj.setFilteringEnabled(null); + toolContentObj.setFilteringEnabled(Boolean.FALSE); toolContentObj.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)); toolContentObj.setLockOnFinished(Boolean.FALSE); toolContentObj.setOfflineInstructions(null);