From ee0bc6c7295494afce346f8185b9eb261ff0558f Mon Sep 17 00:00:00 2001 From: chenson42 Date: Thu, 7 Feb 2013 18:14:38 +0000 Subject: [PATCH] 0001036: Error is not getting recorded in outgoing batch if there isn't a line number --- .../jumpmind/symmetric/service/impl/AcknowledgeService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AcknowledgeService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AcknowledgeService.java index 30cfa50376..3d815f132a 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AcknowledgeService.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AcknowledgeService.java @@ -97,6 +97,9 @@ public void ack(final BatchAck batch) { outgoingBatch.setNetworkMillis(batch.getNetworkMillis()); outgoingBatch.setFilterMillis(batch.getFilterMillis()); outgoingBatch.setLoadMillis(batch.getDatabaseMillis()); + outgoingBatch.setSqlCode(batch.getSqlCode()); + outgoingBatch.setSqlState(batch.getSqlState()); + outgoingBatch.setSqlMessage(batch.getSqlMessage()); if (!batch.isOk() && batch.getErrorLine() != 0) { List ids = sqlTemplate.query(getSql("selectDataIdSql"), @@ -105,9 +108,6 @@ public void ack(final BatchAck batch) { outgoingBatch.setFailedDataId(ids.get((int) batch.getErrorLine() - 1) .longValue()); } - outgoingBatch.setSqlCode(batch.getSqlCode()); - outgoingBatch.setSqlState(batch.getSqlState()); - outgoingBatch.setSqlMessage(batch.getSqlMessage()); } if (status == Status.ER) {