Fix “Lock wait timeout exceeded”

ff4j · Mar 25, 2017 · 0528c0c · 0528c0c
1 parent db6393b
commit 0528c0c
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/ff4j-core/src/main/java/org/ff4j/store/JdbcFeatureStore.java b/ff4j-core/src/main/java/org/ff4j/store/JdbcFeatureStore.java
@@ -480,16 +480,21 @@ public void update(Feature fp) {
             ps = sqlConn.prepareStatement(getQueryBuilder().deleteAllFeatureCustomProperties());
             ps.setString(1, fpExist.getUid());
             ps.executeUpdate();
+            closeStatement(ps);
+            ps = null;
 
-            // CREATE PROPERTIES
-            createCustomProperties(fp.getUid(), fp.getCustomProperties().values());
-
-            } catch (SQLException sqlEX) {
-                throw new FeatureAccessException(CANNOT_CHECK_FEATURE_EXISTENCE_ERROR_RELATED_TO_DATABASE, sqlEX);
-            } finally {
+            // CREATE CUSTOM PROPERTIES
+            for (Property property : fp.getCustomProperties().values()) {
+                ps = createCustomProperty(sqlConn, fp.getUid(), property);
                 closeStatement(ps);
-                closeConnection(sqlConn);
+                ps = null;
             }
+        } catch (SQLException sqlEX) {
+            throw new FeatureAccessException(CANNOT_CHECK_FEATURE_EXISTENCE_ERROR_RELATED_TO_DATABASE, sqlEX);
+        } finally {
+            closeStatement(ps);
+            closeConnection(sqlConn);
+        }
     }
 
     /** {@inheritDoc} */