Merged V3.3-BUG-FIX to HEAD

22796: Merged V3.3 to V3.3-BUG-FIX
      22728: (RECORD ONLY) Undoing (reverse-merging) change 22715 as it should not have been committed on this branch.
         22715 was a fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued.
      22757: Fix for ALF-4984 - Removed obsolete bean defs from custom-slingshot-application-context.xml.sample file for Share
      22794: ALF-3858: Handle creation of custom subtypes and copying of their properties and aspects during the "MS Word Shuffle"
      22795: Merged DEV/TEMPORARY to V3.3
         22743: ALF-4949 : Impossible to import fileplan
            1. Incorrect import url generation was fixed.
            2. Manual testing was preformed.


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

source/java/org/alfresco/filesys/repo/CifsHelper.java

@@ -324,7 +324,7 @@ public class CifsHelper
      * @return Returns a newly created file or folder node
      * @throws FileExistsException if the file or folder already exists
      */
-    public NodeRef createNode(NodeRef rootNodeRef, String path, boolean isFile) throws FileExistsException
+    public NodeRef createNode(NodeRef rootNodeRef, String path, QName typeQName) throws FileExistsException
     {
         // split the path up into its constituents
         StringTokenizer tokenizer = new StringTokenizer(path, FileName.DOS_SEPERATOR_STR, false);
@@ -355,8 +355,6 @@ public class CifsHelper
                     folderPathElements,
                     ContentModel.TYPE_FOLDER).getNodeRef();
         }
-        // add the file or folder
-        QName typeQName = isFile ? ContentModel.TYPE_CONTENT : ContentModel.TYPE_FOLDER;
         try
         {
             NodeRef nodeRef = fileFolderService.create(parentFolderNodeRef, name, typeQName).getNodeRef();
@@ -367,7 +365,7 @@ public class CifsHelper
                 logger.debug("Created node: \n" +
                         "   device root: " + rootNodeRef + "\n" +
                         "   path: " + path + "\n" +
-                        "   is file: " + isFile + "\n" +
+                        "   type: " + typeQName + "\n" +
                         "   new node: " + nodeRef);
             }
             return nodeRef;