[kafka] branch trunk updated: HOTFIX: Avoid ambiguity error of Properties#putAll in Java 11 and scala 2.12 (#8599)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

manikumar pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 6bb4bbf  HOTFIX: Avoid ambiguity error of Properties#putAll in Java 11 and scala 2.12 (#8599)
6bb4bbf is described below

commit 6bb4bbf8745dab94171562e2fcfd6b0c31adf4d3
Author: Chia-Ping Tsai <ch...@gmail.com>
AuthorDate: Fri May 1 17:39:52 2020 +0800

    HOTFIX: Avoid ambiguity error of Properties#putAll in Java 11 and scala 2.12 (#8599)
    
    Reviewers: Manikumar Reddy <ma...@gmail.com>
---
 core/src/main/scala/kafka/admin/ConfigCommand.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/scala/kafka/admin/ConfigCommand.scala b/core/src/main/scala/kafka/admin/ConfigCommand.scala
index 5bac33d..991b0f1 100644
--- a/core/src/main/scala/kafka/admin/ConfigCommand.scala
+++ b/core/src/main/scala/kafka/admin/ConfigCommand.scala
@@ -249,7 +249,7 @@ object ConfigCommand extends Config {
     val props = new Properties
     if (opts.options.has(opts.addConfigFile)) {
       val file = opts.options.valueOf(opts.addConfigFile)
-      props.putAll(Utils.loadProps(file))
+      props ++= Utils.loadProps(file)
     }
     if (opts.options.has(opts.addConfig)) {
       // Split list by commas, but avoid those in [], then into KV pairs