Merged V2.2 to HEAD

7732: Support to cache null QName look ups ...
   7733: Support for store ACLs
   7741: Fix for over keen stiore ACLs ....
   7794: Fix for WCM-1019, tasks show all assets as modified when only one has
   7996: Fix for AWC-1519: cancelling discussion creation results in error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/forums/CreateDiscussionDialog.java

@@ -180,16 +180,15 @@ public class CreateDiscussionDialog extends CreateTopicDialog
          tx.begin();
          
          // remove the discussable aspect from the node we were going to discuss!
+         // AWC-1519: removing the aspect that defines the child association now does the 
+         //           cascade delete so we no longer have to delete the child explicitly
          this.getNodeService().removeAspect(this.discussingNodeRef, ForumModel.ASPECT_DISCUSSABLE);
          
-         // delete the forum space created when the wizard started         
-         Node forumNode = this.navigator.getCurrentNode();
-         this.getNodeService().deleteNode(forumNode.getNodeRef());
-            
          // commit the transaction
          tx.commit();
          
          // remove this node from the breadcrumb if required
+         Node forumNode = this.navigator.getCurrentNode();
          this.browseBean.removeSpaceFromBreadcrumb(forumNode);
                
          // clear action context