Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)

115457 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113252 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113201 vshikunets: MNT-11220: Access Denied thrown if model is missing
            - Fixed build failure. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115667 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-10-30 00:10:02 +00:00
parent 3114f75a0d
commit 9f4fdeb0e4

View File

@@ -625,8 +625,8 @@ public class RepoAdminServiceImplTest extends TestCase
try
{
behaviourFilter.disableBehaviour(ContentModel.TYPE_DICTIONARY_MODEL);
dictionaryDAO.removeModel(modelName);
nodeService.deleteNode(model1);
dictionaryDAO.destroy();
}
finally
{