Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java,v
diff -u -r1.23 -r1.24
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	17 Sep 2006 06:22:30 -0000	1.23
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	5 Oct 2006 00:54:22 -0000	1.24
@@ -40,7 +40,7 @@
 					+ " where is_authored = true and forum_uid=? order by create_date";
 	
 	private static final String SQL_QUERY_COUNT_SESSION_TOPICS_FROM_AUTHOR = "select count(*) from " + Message.class.getName()
-	+ " as m where m.isAuthored = true and m.toolSession.uid=?";
+	+ " as m where m.isAuthored = true and m.toolSession.sessionId=?";
 	
 	private static final String SQL_QUERY_FIND_CHILDREN = "from " + Message.class.getName()
 					+ " where parent=?";
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v
diff -u -r1.78 -r1.79
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	4 Oct 2006 08:56:05 -0000	1.78
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	5 Oct 2006 00:54:21 -0000	1.79
@@ -473,13 +473,15 @@
 	public void cloneContentTopics(Long contentID, Long sessionID) {
 		//only session does not have content topcis
 		if(!messageDao.hasAuthoredTopics(sessionID)){
+			log.debug("Clone tool content [" + contentID +"] topics for session [" + sessionID + "]");
+			
 			Forum forum = (Forum) forumDao.getByContentId(contentID);
 			Set<Message> contentTopcis = forum.getMessages();
 			
 			//only forum has content topics, clone happens 
 			if(contentTopcis != null && contentTopcis.size() > 0){
 				for(Message msg : contentTopcis){
-					if(msg.getIsAuthored()){
+					if(msg.getIsAuthored() && msg.getToolSession() == null){
 						Message newMsg = Message.newInstance(msg, forumToolContentHandler);
 						createRootTopic(contentID, sessionID, newMsg);
 					}