cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject cassandra git commit: use slf4j string formatter for strings with {} markers
Date Fri, 15 May 2015 02:19:57 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 7f9ed0ddb -> 311cb7783


use slf4j string formatter for strings with {} markers


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/311cb778
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/311cb778
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/311cb778

Branch: refs/heads/trunk
Commit: 311cb7783b140ef74589b6790a5fc7f09759a3bf
Parents: 7f9ed0d
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Thu May 14 22:19:40 2015 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Thu May 14 22:19:40 2015 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/cql3/statements/BatchStatement.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/311cb778/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
index ddc46c1..82e122c 100644
--- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
@@ -22,9 +22,10 @@ import java.util.*;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
+import org.slf4j.helpers.MessageFormatter;
 import org.apache.cassandra.config.ColumnDefinition;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.cql3.*;
@@ -261,7 +262,7 @@ public class BatchStatement implements CQLStatement
             {
                 logger.warn(format, ksCfPairs, size, warnThreshold, size - warnThreshold,
"");
             }
-            ClientWarn.warn(String.format(format, ksCfPairs, size, warnThreshold, size -
warnThreshold, ""));
+            ClientWarn.warn(MessageFormatter.arrayFormat(format, new Object[] {ksCfPairs,
size, warnThreshold, size - warnThreshold, ""}).getMessage());
         }
     }
 


Mime
View raw message