From 4e6a415eb2bfd602cedac9c90f780b113d46b12e Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Thu, 20 Feb 2014 14:36:47 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)   
 62919: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)       62510:
 ACE-33 - fix for unit test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62974 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../model/filefolder/FileFolderServiceImpl.java    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
index c727021547..0c29a9480c 100644
--- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
+++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
@@ -1238,6 +1238,20 @@ public class FileFolderServiceImpl extends AbstractBaseCopyService implements Fi
         Map<QName, Serializable> properties = new HashMap<QName, Serializable>(11);
         properties.put(ContentModel.PROP_NAME, (Serializable) name);
         
+        // Check the type is valid for file/folder service
+        FileFolderServiceType type = getType(typeQName);
+        
+        switch (type)
+        {
+            case SYSTEM_FOLDER:
+                throw new InvalidTypeException("System Folders are not handled by this service :" + typeQName);
+            case INVALID:
+        	    throw new InvalidTypeException("Type is not handled by this service: " + typeQName);
+            case FILE:
+            case FOLDER:
+            default:
+        }
+        
         // create the node
         if (assocQName == null)
         {