Commit Graph

7 Commits

Author SHA1 Message Date
Will Abson
bfc837b9d7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71628: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      71467: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         71466: MNT-9899 : Change default value for db.pool.max to 275
         Fixed the test hanging if db.pool.wait.max=-1 and disabled the test as it is not necessary until valid configuration is discovered.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:33:19 +00:00
Will Abson
21670732fa Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71604: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70359: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70323: Merged DEV to V4.1-BUG-FIX (4.1.9)
            70317: MNT-9899 : Change default value for db.pool.max to 275
            Converted CannotCreateTransactionException to the new ConnectionPoolException when the DB connection pool is depleted.
            Implemented test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:31:17 +00:00
Alan Davis
5763abbf6d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69949: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69867: Fix handling of non-propagating transactions embedded in write transactions that have been forced writable (MNT-11310)
       - Test to demonstrate the failure
       - Regardless of whether a RetryingTransactionHelper was going to create a new transaction (non-propagating) or not,
         it did a sanity check of its read-write state against the desired state.  This was kicking things out for cases
         where the RetryingTransactionInterceptor should just have been going along with the current transaction.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:09:47 +00:00
Alan Davis
b00157153f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63647: Fixed ACE-290: ServiceRegistry.getRetryingTransactionHelper has been deprecated, with no public alternative
    - Removed final bits of deprecation required for ACE-290
    - Added test to ensure that ALF-18718 does not regress (need new instances of RetryingTransactionHelper)
    - Cleaned up pointless 'Non-Javadoc', added @Override, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:29:01 +00:00
Alan Davis
8a8cf1b81a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
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
2014-02-12 01:06:17 +00:00
Alan Davis
068939e250 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58376: Added additional tests to ownJVMCategory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61971 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:20:56 +00:00
Samuel Langlois
ab4ca7177f Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00