From cea3e35b55210a2ac4f782ae20c2700ba1ac8748 Mon Sep 17 00:00:00 2001
From: Jan Vonka <jan.vonka@alfresco.com>
Date: Fri, 7 Oct 2011 08:29:01 +0000
Subject: [PATCH] Fix WorkflowTestSuite - fallout from r30993 (and earlier
 r30270) - we should never have null tenant domain

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31026 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/workflow/WorkflowObjectFactory.java       | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java b/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java
index 2636252624..a22e5322dc 100644
--- a/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java
@@ -334,7 +334,6 @@ public class WorkflowObjectFactory
 
     public <T extends Object> List<T> filterByDomain(Collection<T> values, final Function<T, String> processKeyGetter)
     {
-        final boolean enabled = tenantService.isEnabled();
         final String currentDomain = tenantService.getCurrentUserDomain();
         return CollectionUtils.filter(values, new Filter<T>()
         {
@@ -342,18 +341,7 @@ public class WorkflowObjectFactory
             {
                 String key = processKeyGetter.apply(value);
                 String domain = tenantService.getDomain(key, false);
-                if(enabled)
-                {
-                    if(currentDomain.equals(domain))
-                    {
-                        return true; // The domains match so include.
-                    }
-                }
-                else if(domain==null)
-                {
-                    return true; // In single-tenant mode only return items with no domain.
-                }
-                return false;
+                return (currentDomain.equals(domain));
             }
         });
     }