From c5f23647cc9c9abbd4531cef92ac5211b227ce28 Mon Sep 17 00:00:00 2001
From: Andrew Hind <andy.hind@alfresco.com>
Date: Thu, 30 Jan 2014 10:56:31 +0000
Subject: [PATCH] Fix for     CLOUD-2264   'SELECT * FROM cmis:folder' query
 returns objects with cmis:baseTypeId set to 'cmis:document'

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@60760 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/opencmis/CMISConnector.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/java/org/alfresco/opencmis/CMISConnector.java b/source/java/org/alfresco/opencmis/CMISConnector.java
index aeada8c4ce..612e96206e 100644
--- a/source/java/org/alfresco/opencmis/CMISConnector.java
+++ b/source/java/org/alfresco/opencmis/CMISConnector.java
@@ -2790,6 +2790,12 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
                     continue;
                 }
                 
+                TypeDefinitionWrapper type = getType(nodeRef);
+                if (type == null)
+                {
+                    continue;
+                }
+                
                 ObjectDataImpl hit = new ObjectDataImpl();
                 PropertiesImpl properties = new PropertiesImpl();
                 hit.setProperties(properties);
@@ -2806,12 +2812,6 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
 
                 if (fetchObject)
                 {
-                    TypeDefinitionWrapper type = getType(nodeRef);
-                    if (type == null)
-                    {
-                        continue;
-                    }
-
                     // set allowable actions
                     if (includeAllowableActions)
                     {