From a1e185b0f651322ff04e60ad4065d1b410d550d0 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Mon, 24 Jun 2019 13:41:21 +1200 Subject: [PATCH] Refactor tidy internals - BatchedPstmtHolder, always true condition (no effective change) Remove condition check on firstError == null ... as it is always true --- .../server/persist/BatchedPstmtHolder.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java index 3ac38f6c0..6b5eb26dd 100644 --- a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java +++ b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java @@ -117,7 +117,6 @@ public class BatchedPstmtHolder { BatchedPstmt[] values = stmtMap.values().toArray(new BatchedPstmt[stmtMap.values().size()]); clear(); - // this loop for (BatchedPstmt bs : values) { try { if (!isError) { @@ -130,12 +129,8 @@ public class BatchedPstmtHolder { next = next.getNextException(); } - if (firstError == null) { - firstError = ex; - errorSql = bs.getSql(); - } else { - logger.error("Error executing batched PreparedStatement", ex); - } + firstError = ex; + errorSql = bs.getSql(); isError = true; } finally { @@ -147,7 +142,6 @@ public class BatchedPstmtHolder { } } - if (firstError != null) { String msg = "Error when batch flush on sql: " + errorSql; throw new BatchedSqlException(msg, firstError);