From 42d35f8ec68178054680227dd11fa65a765812a0 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Wed, 26 Oct 2016 15:45:10 +0200
Subject: [PATCH] FIX: removed trailing commas in logs

---
 .../com/avaje/ebeaninternal/server/persist/Binder.java    | 4 +++-
 .../ebeaninternal/server/persist/dml/DmlHandler.java      | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java b/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java
index 5c51fae18..f9e329562 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java
@@ -149,12 +149,14 @@ public class Binder {
         if (param.isInParam()) {
           value = param.getInValue();
           if (bindLog != null) {
+            if (bindLog.length() > 0) {
+              bindLog.append(", ");
+            }
             if (param.isEncryptionKey()) {
               bindLog.append("****");
             } else {
               bindLog.append(value);
             }
-            bindLog.append(", ");
           }
           if (value == null) {
             // this doesn't work for query predicates
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java
index b68776381..f49c35936 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -165,6 +165,9 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
   @Override
   public void bind(Object value, int sqlType) throws SQLException {
     if (logLevelSql) {
+      if (bindLog.length() > 0) {
+        bindLog.append(",");
+      }
       if (value == null) {
         bindLog.append("null");
       } else {
@@ -175,7 +178,6 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
           bindLog.append(sval);
         }
       }
-      bindLog.append(",");
     }
     dataBind.setObject(value, sqlType);
   }
@@ -207,6 +209,9 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
   private void bindInternal(boolean log, Object value, BeanProperty prop) throws SQLException {
 
     if (log) {
+      if (bindLog.length() > 0) {
+        bindLog.append(",");
+      }
       if (prop.isLob()) {
         bindLog.append("[LOB]");
       } else {
@@ -216,7 +221,6 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
         }
         bindLog.append(sv);
       }
-      bindLog.append(",");
     }
     // do the actual binding to PreparedStatement
     prop.bind(dataBind, value);