[kafka] branch trunk updated: HOTFIX: Fix Properties.putAll compiler error when compiling with Java 11 (#6140)

[rsivaram]

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

rsivaram 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 12947f4  HOTFIX: Fix Properties.putAll compiler error when compiling 
with Java 11 (#6140)
12947f4 is described below

commit 12947f4f944955240fd14ce8b75fab5464ea6808
Author: Ismael Juma <ism...@juma.me.uk>
AuthorDate: Mon Jan 14 04:24:26 2019 -0800

    HOTFIX: Fix Properties.putAll compiler error when compiling with Java 11 
(#6140)
---
 core/src/test/scala/unit/kafka/network/SocketServerTest.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala 
b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala
index 2609d9e..26db52e 100644
--- a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala
+++ b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala
@@ -28,6 +28,7 @@ import com.yammer.metrics.{Metrics => YammerMetrics}
 import javax.net.ssl._
 import kafka.security.CredentialProvider
 import kafka.server.{KafkaConfig, ThrottledChannel}
+import kafka.utils.Implicits._
 import kafka.utils.TestUtils
 import org.apache.kafka.common.TopicPartition
 import org.apache.kafka.common.memory.MemoryPool
@@ -188,7 +189,7 @@ class SocketServerTest extends JUnitSuite {
   @Test
   def testControlPlaneRequest(): Unit = {
     val testProps = new Properties
-    testProps.putAll(props)
+    testProps ++= props
     testProps.put("listeners", 
"PLAINTEXT://localhost:0,CONTROLLER://localhost:5000")
     testProps.put("listener.security.protocol.map", 
"PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT")
     testProps.put("control.plane.listener.name", "CONTROLLER")
@@ -1320,4 +1321,4 @@ class SocketServerTest extends JUnitSuite {
       sockets.filterNot(socket => isSocketConnectionId(failedConnectionId, 
socket))
     }
   }
-}
\ No newline at end of file
+}