inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
59123: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59111: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59070: Merged DEV to V4.1-BUG-FIX (4.1.8)
            58849: MNT-10096: MT: AbstractTenantRoutingContentStore can return null list of stores
              - Ensure that RetryingTransactionHelper starts a transaction in txn-after-completion phase (MNT-9806).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 01:06:17 +00:00
parent 68bfd2b72e
commit 8a8cf1b81a
3 changed files with 67 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/test-java/org/alfresco/repo/transaction/AlfrescoTransactionSupportTest.java
View File

@@ -246,6 +246,12 @@ public class AlfrescoTransactionSupportTest extends TestCase
{
postCommitReadState[0] = AlfrescoTransactionSupport.getTransactionReadState();
}
@Override
public void afterRollback()
{
postCommitReadState[0] = AlfrescoTransactionSupport.getTransactionReadState();
}
};
RetryingTransactionCallback<TxnReadState> getReadStateWork = new RetryingTransactionCallback<TxnReadState>()
@@ -271,6 +277,20 @@ public class AlfrescoTransactionSupportTest extends TestCase
checkTxnReadState = transactionService.getRetryingTransactionHelper().doInTransaction(getReadStateWork, false);
assertEquals("Expected 'read-write transaction'", TxnReadState.TXN_READ_WRITE, checkTxnReadState);
assertEquals("Expected 'no transaction'", TxnReadState.TXN_NONE, postCommitReadState[0]);
// Check TXN_NONE on rollback
UserTransaction txn = transactionService.getUserTransaction();
txn.begin();
AlfrescoTransactionSupport.bindListener(getReadStatePostCommit);
txn.rollback();
assertEquals("Expected 'no transaction'", TxnReadState.TXN_NONE, postCommitReadState[0]);
// Check TXN_NONE on commit
txn = transactionService.getUserTransaction();
txn.begin();
AlfrescoTransactionSupport.bindListener(getReadStatePostCommit);
txn.commit();
assertEquals("Expected 'no transaction'", TxnReadState.TXN_NONE, postCommitReadState[0]);
}
public void testResourceHelper() throws Exception