Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r7a1c6972ff38760192dbdaac41ed8e5e99105247 -r16913ae571fceab1287d08d9ffc8c995a236620a
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 7a1c6972ff38760192dbdaac41ed8e5e99105247)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 16913ae571fceab1287d08d9ffc8c995a236620a)
@@ -552,11 +552,11 @@
 					"Failed to create the ForumFiles tool seession");
 
 		Forum fromContent = null;
-		if ( fromContentId == null ) {
+		if ( fromContentId != null ) {
 			fromContent = forumDao.getByContentId(fromContentId);
 		}
 		if ( fromContent == null ) {
-			fromContent = getDefaultContent(fromContentId);
+			fromContent = getDefaultForum();
 		}
 		
 		Forum toContent = Forum.newInstance(fromContent,toContentId,forumToolContentHandler);