bugfix: ensure select for update retry correctly (apache#1452)

pengten · Aug 14, 2019 · 73cd6d3 · 73cd6d3
1 parent 0159009
commit 73cd6d3
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/SelectForUpdateExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/SelectForUpdateExecutor.java
@@ -63,13 +63,14 @@ public T doExecute(Object... args) throws Throwable {
                 conn.setAutoCommit(false);
             }
             sp = conn.setSavepoint();
-            // #870
-            // execute return Boolean
-            // executeQuery return ResultSet
-            rs = statementCallback.execute(statementProxy.getTargetStatement(), args);
 
             while (true) {
                 try {
+                    // #870
+                    // execute return Boolean
+                    // executeQuery return ResultSet
+                    rs = statementCallback.execute(statementProxy.getTargetStatement(), args);
+
                     // Try to get global lock of those rows selected
                     TableRecords selectPKRows = buildTableRecords(getTableMeta(), selectPKSQL, paramAppenderList);
                     String lockKeys = buildLockKey(selectPKRows);