Merge pull request apache#89 from lyennon/master

the anno.name() is always not null
houchangok · Jan 15, 2019 · 33275c7 · 33275c7
2 parents 0798371 + 9bb056f
commit 33275c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/spring/src/main/java/com/alibaba/fescar/spring/annotation/GlobalTransactional.java b/spring/src/main/java/com/alibaba/fescar/spring/annotation/GlobalTransactional.java
@@ -37,6 +37,6 @@
      * Given name of the global transaction instance.
      * @return Given name.
      */
-    String name() default "default";
+    String name() default "";
 
 }
diff --git a/...ng/src/main/java/com/alibaba/fescar/spring/annotation/GlobalTransactionalInterceptor.java b/...ng/src/main/java/com/alibaba/fescar/spring/annotation/GlobalTransactionalInterceptor.java
@@ -19,6 +19,7 @@
 import java.lang.reflect.Method;
 
 import com.alibaba.fescar.common.exception.ShouldNeverHappenException;
+import com.alibaba.fescar.common.util.StringUtils;
 import com.alibaba.fescar.tm.api.DefaultFailureHandlerImpl;
 import com.alibaba.fescar.tm.api.FailureHandler;
 import com.alibaba.fescar.tm.api.TransactionalExecutor;
@@ -61,8 +62,9 @@ public int timeout() {
 
                     @Override
                     public String name() {
-                        if (anno.name() != null) {
-                            return anno.name();
+                        String name = anno.name();
+                        if (!StringUtils.isEmpty(name)) {
+                            return name;
                         }
                         return formatMethod(methodInvocation.getMethod());
                     }