diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml index 316ad79e..5fbb8ccc 100644 --- a/mybatis-flex-spring/pom.xml +++ b/mybatis-flex-spring/pom.xml @@ -39,12 +39,7 @@ org.springframework spring-jdbc - - com.mybatis-flex - mybatis-flex-annotation - 1.7.4 - compile - + diff --git a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexTransactionManager.java b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexTransactionManager.java index d482dea5..ec5317f1 100644 --- a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexTransactionManager.java +++ b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexTransactionManager.java @@ -26,6 +26,7 @@ import org.springframework.transaction.support.DefaultTransactionStatus; /** * MyBatis-Flex 事务支持。 + * * @author michael */ public class FlexTransactionManager extends AbstractPlatformTransactionManager { @@ -95,17 +96,17 @@ public class FlexTransactionManager extends AbstractPlatformTransactionManager { this.prevXid = prevXid; } - public void setRollbackOnly(){ + public void setRollbackOnly() { ROLLBACK_ONLY_XIDS.set(prevXid); } - public void clear(){ + public void clear() { ROLLBACK_ONLY_XIDS.remove(); } @Override public boolean isRollbackOnly() { - return currentXid.equals(ROLLBACK_ONLY_XIDS.get()); + return currentXid != null && currentXid.equals(ROLLBACK_ONLY_XIDS.get()); } }