From 35e2991ed89da7398809e751119b7ce86d56ea40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= <fuhai999@gmail.com>
Date: Wed, 22 Nov 2023 09:54:38 +0800
Subject: [PATCH] fix: NPE in FlexTransactionManager.java

---
 mybatis-flex-spring/pom.xml                                | 7 +------
 .../com/mybatisflex/spring/FlexTransactionManager.java     | 7 ++++---
 2 files changed, 5 insertions(+), 9 deletions(-)

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 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.mybatis-flex</groupId>
-            <artifactId>mybatis-flex-annotation</artifactId>
-            <version>1.7.4</version>
-            <scope>compile</scope>
-        </dependency>
+
     </dependencies>
 
 </project>
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());
         }
     }