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 2f26787 HOTFIX: ambiguity issue calling putAll() in scala compilation
against JAVA 9
2f26787 is described below
commit 2f267871eac86623950e8e3a67a98687e42a0b3e
Author: RichardYuSTUG <[email protected]>
AuthorDate: Sun Jan 28 13:20:58 2018 +0000
HOTFIX: ambiguity issue calling putAll() in scala compilation against JAVA 9
The cause for compilation error in JDK 9.0 was an ambiguity issue in scalac:
```
both method putAll in class Properties of type (x$1: java.util.Map[_,
_])Unit
and method putAll in class Hashtable of type (x$1: java.util.Map[_ <:
Object, _ <: Object])Unit
match argument types (java.util.Properties)
newProps.putAll(props)
```
Author: RichardYuSTUG <[email protected]>
Reviewers: Manikumar Reddy O <[email protected]>, Rajini Sivaram
<[email protected]>
Closes #4482 from ConcurrencyPractitioner/trunk
---
.../integration/kafka/server/DynamicBrokerReconfigurationTest.scala | 2 +-
core/src/test/scala/unit/kafka/log/LogCleanerIntegrationTest.scala | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git
a/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala
b/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala
index c83a4dc..30db7e3 100644
---
a/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala
+++
b/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala
@@ -368,7 +368,7 @@ class DynamicBrokerReconfigurationTest extends
ZooKeeperTestHarness with SaslSet
)
invalidProps.foreach { case (k, v) =>
val newProps = new Properties
- newProps.putAll(props)
+ newProps ++= props
props.put(k, v)
reconfigureServers(props, perBrokerConfig = false, (k,
props.getProperty(k)), expectFailure = true)
}
diff --git a/core/src/test/scala/unit/kafka/log/LogCleanerIntegrationTest.scala
b/core/src/test/scala/unit/kafka/log/LogCleanerIntegrationTest.scala
index 22d7e77..152d6d3 100755
--- a/core/src/test/scala/unit/kafka/log/LogCleanerIntegrationTest.scala
+++ b/core/src/test/scala/unit/kafka/log/LogCleanerIntegrationTest.scala
@@ -18,7 +18,6 @@
package kafka.log
import java.io.File
-import java.util
import java.util.Properties
import kafka.api.KAFKA_0_11_0_IV0
--
To stop receiving notification emails like this one, please contact
[email protected].
