Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

93833: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93717: Merged DEV (5.0.1) to 5.0.N (5.0.1)                                                                                                                                                                                                          
         93680: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server                                                                                                                                                                            
         Fixed AuthenticationTest and RenditionServiceIntegrationTest not to hang on MS SQl Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94994 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 12:31:57 +00:00
parent 33a3a89e34
commit 001e1846db
2 changed files with 34 additions and 3 deletions

View File

@@ -1730,8 +1730,13 @@ public class AuthenticationTest extends TestCase
// authenticationService.deleteAuthentication("andy");
}
public void testLoginNotExistingTenant()
public void testLoginNotExistingTenant() throws Exception
{
// split the transactions to pass on SQL Server
// see MNT-13089
userTransaction.commit();
userTransaction = transactionService.getUserTransaction();
userTransaction.begin();
boolean wasEnabled = AuthenticationUtil.isMtEnabled();
try