diff --git a/pom.xml b/pom.xml index 0dac64aed0..24ee005720 100644 --- a/pom.xml +++ b/pom.xml @@ -57,8 +57,8 @@ 0.0.33 1.9.22.1 - 6.1.14 - 6.3.8 + 6.2.8 + 6.3.9 3.5.3 2.17.2 4.1.0 diff --git a/repository/src/main/java/org/alfresco/repo/transaction/RetryingTransactionInterceptor.java b/repository/src/main/java/org/alfresco/repo/transaction/RetryingTransactionInterceptor.java index b00b6671a1..3b605ac0e9 100755 --- a/repository/src/main/java/org/alfresco/repo/transaction/RetryingTransactionInterceptor.java +++ b/repository/src/main/java/org/alfresco/repo/transaction/RetryingTransactionInterceptor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2025 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -28,9 +28,6 @@ package org.alfresco.repo.transaction; import java.lang.reflect.Method; import java.util.List; -import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; -import org.alfresco.service.transaction.TransactionService; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.springframework.transaction.PlatformTransactionManager; @@ -38,6 +35,10 @@ import org.springframework.transaction.TransactionManager; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.transaction.interceptor.TransactionAttribute; +import org.alfresco.error.AlfrescoRuntimeException; +import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; +import org.alfresco.service.transaction.TransactionService; + /** * @author Dmitry Velichkevich */ @@ -64,7 +65,7 @@ public class RetryingTransactionInterceptor extends TransactionAspectSupport imp final TransactionAttribute txnAttr = getTransactionAttributeSource().getTransactionAttribute( method, invocation.getThis().getClass()); - final TransactionManager tm = determineTransactionManager(txnAttr); + final TransactionManager tm = determineTransactionManager(txnAttr, null); if (tm != null && !(tm instanceof PlatformTransactionManager)) { @@ -83,8 +84,7 @@ public class RetryingTransactionInterceptor extends TransactionAspectSupport imp retryingTransactionHelper.setExtraExceptions(extraExceptions); return retryingTransactionHelper.doInTransaction( - new RetryingTransactionCallback() - { + new RetryingTransactionCallback() { public Object execute() { TransactionInfo txInfo = createTransactionIfNecessary(ptm, TransactionAttribute.PROPAGATION_REQUIRES_NEW == txnAttr diff --git a/repository/src/test/java/org/alfresco/util/BaseSpringTest.java b/repository/src/test/java/org/alfresco/util/BaseSpringTest.java index 5bf8f574d9..bf8f3dc3d7 100644 --- a/repository/src/test/java/org/alfresco/util/BaseSpringTest.java +++ b/repository/src/test/java/org/alfresco/util/BaseSpringTest.java @@ -1,55 +1,54 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package org.alfresco.util; - -import junit.framework.TestCase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; - -/** - * Base test class providing Hibernate sessions. - *

- * By default this is auto-wired by type. If a this is going to - * result in a conlict the use auto-wire by name. This can be done by - * setting populateProtectedVariables to true in the constructor and - * then adding protected members with the same name as the bean you require. - * - * @author Derek Hulley - */ -@RunWith(SpringRunner.class) -@ContextConfiguration({"classpath:alfresco/application-context.xml"}) -public abstract class BaseSpringTest extends TestCase -{ - public Log logger = LogFactory.getLog(getClass().getName()); - - @Autowired - protected ApplicationContext applicationContext; -} +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2025 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.util; + +import junit.framework.TestCase; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.ContextCustomizerFactories; +import org.springframework.test.context.junit4.SpringRunner; + +/** + * Base test class providing Hibernate sessions. + *

+ * By default this is auto-wired by type. If a this is going to result in a conlict the use auto-wire by name. This can be done by setting populateProtectedVariables to true in the constructor and then adding protected members with the same name as the bean you require. + * + * @author Derek Hulley + */ +@RunWith(SpringRunner.class) +@ContextConfiguration({"classpath:alfresco/application-context.xml"}) +@ContextCustomizerFactories(factories = {}, mergeMode = ContextCustomizerFactories.MergeMode.REPLACE_DEFAULTS) +public abstract class BaseSpringTest extends TestCase +{ + public Log logger = LogFactory.getLog(getClass().getName()); + + @Autowired + protected ApplicationContext applicationContext; +}