Merge pull request #58 from aquality-automation/feature/fix_deadlock

Feature/fix deadlock

Author: VladislavKostyukevich

CHANGELOG.md

@@ -5,6 +5,8 @@
 Features:
   - [Doc] Update Swagger with Statistic endpoints -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/76)
 
+Features:
+  - [BUG] Import was finished with Error! You are trying to edit entity which is locked -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/44)
 ## 0.3.7 (2020-03-02)
 
 Features:

src/main/java/main/model/db/dao/DAO.java

@@ -270,13 +270,22 @@ private CallableStatement executeCallableStatement(String sql, List<Pair<String,
             }
         }
 
-        try {
-            callableStatement.execute();
-        } catch (SQLException e) {
-            throw new AqualitySQLException(e);
-        }
+        return tryExecute(callableStatement);
+    }
 
-        return callableStatement;
+    private CallableStatement tryExecute(CallableStatement callableStatement) throws AqualitySQLException {
+        int counter = 0;
+        SQLException lastException = null;
+        while(counter < 5) {
+            try {
+                callableStatement.execute();
+                return callableStatement;
+            } catch (SQLException e) {
+                counter++;
+                lastException = e;
+            }
+        }
+        throw new AqualitySQLException(lastException);
     }
 
     private CallableStatement getCallableStatement(String sql) throws AqualityException {