From a967ade5b8483e71a6fee360179047b3b8b755ee Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Fri, 27 Jan 2006 15:43:49 +0000
Subject: [PATCH] Fixed issue where discussions were lost after checkin &
 updated version number

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2230 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../java/org/alfresco/web/bean/ForumsBean.java | 18 ++++++++----------
 .../web/bean/wizard/NewDiscussionWizard.java   |  3 +--
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/source/java/org/alfresco/web/bean/ForumsBean.java b/source/java/org/alfresco/web/bean/ForumsBean.java
index 4bc54d5cd5..74cbc433c3 100644
--- a/source/java/org/alfresco/web/bean/ForumsBean.java
+++ b/source/java/org/alfresco/web/bean/ForumsBean.java
@@ -694,18 +694,16 @@ public class ForumsBean implements IContextListener
             ForumModel.ASSOC_DISCUSSION, RegexQNamePattern.MATCH_ALL);
       
       // there should only be one child, retrieve it if there is
-      if (children.size() == 1)
+      if (children.size() != 1)
       {
-         // show the forum for the discussion
-         NodeRef forumNodeRef = children.get(0).getChildRef();
-         this.browseBean.clickSpace(forumNodeRef);
-         context.getApplication().getNavigationHandler().handleNavigation(context, null, "showForum");
-      }
-      else if (logger.isWarnEnabled())
-      {
-         logger.warn("Node has the discussable aspect but does not have 1 child, it has " + 
-                     children.size() + " children!");
+         throw new IllegalStateException("Node has the discussable aspect but does not have 1 child, it has " + 
+                                         children.size() + " children!");
       }
+      
+      // show the forum for the discussion
+      NodeRef forumNodeRef = children.get(0).getChildRef();
+      this.browseBean.clickSpace(forumNodeRef);
+      context.getApplication().getNavigationHandler().handleNavigation(context, null, "showForum");
    }
       
    /**
diff --git a/source/java/org/alfresco/web/bean/wizard/NewDiscussionWizard.java b/source/java/org/alfresco/web/bean/wizard/NewDiscussionWizard.java
index 71a59fbf4f..0743de425d 100644
--- a/source/java/org/alfresco/web/bean/wizard/NewDiscussionWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/NewDiscussionWizard.java
@@ -34,7 +34,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
-import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.common.component.UIActionLink;
@@ -107,7 +106,7 @@ public class NewDiscussionWizard extends NewTopicWizard
          this.nodeService.addAspect(forumNodeRef, ContentModel.ASPECT_UIFACETS, uiFacetsProps);
          
          if (logger.isDebugEnabled())
-            logger.debug("created forum for content: " + forumNodeRef.toString());
+            logger.debug("created forum for content: " + this.discussingNodeRef.toString());
          
          // commit the transaction
          tx.commit();