root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Revert "Introduce Ordered#NOT_ORDERED" 

This reverts commit da914bcfb4 and also
removes the use of Ordered#NOT_ORDERED from EnableTransactionManagement
and ProxyTransactionManagementConfiguration in favor of defaulting to
Ordered#LOWEST_PRIORITY, which is actually the default that results
when no 'order' attribute is specified in XML.
This commit is contained in:
Chris Beams 2011-06-02 06:49:15 +00:00
parent cf2563bdf5
commit 0304a4b74d
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.springframework.core/src/main/java/org/springframework/core/Ordered.java
View File

@ -47,14 +47,6 @@ public interface Ordered {
*/
int LOWEST_PRECEDENCE = Integer.MAX_VALUE;
/**
* A reserved integer value indicating that a component should
* be treated as unordered. Users should avoid this using this
* reserved value ({@value}) when ordering their own components.
* Useful when populating annotation, where null cannot be specified
* as a default for integer attributes.
*/
int NOT_ORDERED = (Integer.MIN_VALUE +1) / 2; // -1073741823
/**
* Return the order value of this object, with a

4
org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java
View File

@ -52,7 +52,7 @@ public @interface EnableTransactionManagement {
/**
* Indicate the ordering of the execution of the transaction advisor
* when multiple advices are applied at a specific joinpoint.
* The default is to not explicitly order the advisor.
* The default is lowest priority.
*/
int order() default Ordered.NOT_ORDERED;
int order() default Ordered.LOWEST_PRECEDENCE;
}

6
org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java
View File

@ -22,7 +22,6 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Role;
import org.springframework.core.Ordered;
import org.springframework.transaction.config.TransactionManagementConfigUtils;
import org.springframework.transaction.interceptor.BeanFactoryTransactionAttributeSourceAdvisor;
import org.springframework.transaction.interceptor.TransactionAttributeSource;
@ -38,10 +37,7 @@ public class ProxyTransactionManagementConfiguration extends AbstractTransaction
new BeanFactoryTransactionAttributeSourceAdvisor();
advisor.setTransactionAttributeSource(transactionAttributeSource());
advisor.setAdvice(transactionInterceptor());
int order = (Integer)this.enableTx.get("order");
if (order != Ordered.NOT_ORDERED) {
advisor.setOrder(order);
}
advisor.setOrder(((Integer)this.enableTx.get("order")));
return advisor;
}