From dbc38d487967dd16258361b7699eb244ab2a8b96 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Wed, 30 Apr 2014 16:18:10 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    68151:
 Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)       67784:
 MNT-11086 : Reverse merged          Merged DEV to V4.2-BUG-FIX (4.2.2)       
      61306: MNT-10537: BPM Models are filtered for CMIS getTypeDefinition    
            Destroy the dictionary in WorkflowDeployer to clear dictionary
 registry caches.

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

diff --git a/source/java/org/alfresco/repo/workflow/WorkflowDeployer.java b/source/java/org/alfresco/repo/workflow/WorkflowDeployer.java
index 03e35e1cdc..a76fbf3a6a 100644
--- a/source/java/org/alfresco/repo/workflow/WorkflowDeployer.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowDeployer.java
@@ -251,8 +251,6 @@ public class WorkflowDeployer extends AbstractLifecycleBean
         try
         {
             userTransaction.begin();
-
-            boolean destroyDictionary = false;
         
             // bootstrap the workflow models and static labels (from classpath)
             if (models != null && resourceBundles != null && ((models.size() > 0) || (resourceBundles.size() > 0)))
@@ -263,7 +261,6 @@ public class WorkflowDeployer extends AbstractLifecycleBean
                 dictionaryBootstrap.setModels(models);
                 dictionaryBootstrap.setLabels(resourceBundles);
                 dictionaryBootstrap.bootstrap(); // also registers with dictionary
-                destroyDictionary = true;
             }
             
             // bootstrap the workflow definitions (from classpath)
@@ -303,7 +300,6 @@ public class WorkflowDeployer extends AbstractLifecycleBean
                             WorkflowDeployment deployment = workflowService.deployDefinition(engineId, workflowResource.getInputStream(), 
                                         mimetype, workflowResource.getFilename());
                             logDeployment(location, deployment);
-                            destroyDictionary = true;
                         }
                     }
                     else
@@ -328,32 +324,8 @@ public class WorkflowDeployer extends AbstractLifecycleBean
                         deploy(nodeRef, false);
                     }
                 }
-
-                destroyDictionary = true;
             }
-
-            if(destroyDictionary)
-            {
-                RetryingTransactionCallback<Void> work = new RetryingTransactionCallback<Void>()
-                {
-                    public Void execute() throws Throwable
-                    {
-                        AuthenticationUtil.runAs(new RunAsWork<Object>()
-                        {
-                            public Object doWork()
-                            {
-                                dictionaryDAO.destroy();
-                                return null;
-                            }
-                        }, authenticationContext.getSystemUserName());
-
-                        return null;
-                    }
-                };
-
-                transactionService.getRetryingTransactionHelper().doInTransaction(work, true, true);
-            }
-
+                
             userTransaction.commit();
         }
         catch(Throwable e)