You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2022/05/25 16:39:30 UTC
[pulsar] branch branch-2.9 updated: [branch-2.9][fix][broker] Fix jdk API compatibility issues. (#15779)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.9 by this push:
new 25f5cec3923 [branch-2.9][fix][broker] Fix jdk API compatibility issues. (#15779)
25f5cec3923 is described below
commit 25f5cec3923055df0cf3ac81b6c3d10937f612a6
Author: Qiang Zhao <ma...@gmail.com>
AuthorDate: Thu May 26 00:39:23 2022 +0800
[branch-2.9][fix][broker] Fix jdk API compatibility issues. (#15779)
* [branch-2.9][fix][broker] Fix jdk API compatibility issues.
* Fix compile issue
---
.../pulsar/broker/loadbalance/impl/ModularLoadManagerWrapper.java | 6 +++++-
.../broker/transaction/TopicTransactionBufferRecoverTest.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerWrapper.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerWrapper.java
index f2d61d2dcd1..ac55d679219 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerWrapper.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerWrapper.java
@@ -18,6 +18,8 @@
*/
package org.apache.pulsar.broker.loadbalance.impl;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -68,8 +70,10 @@ public class ModularLoadManagerWrapper implements LoadManager {
return leastLoadedBroker.map(s -> {
String webServiceUrl = getBrokerWebServiceUrl(s);
String brokerZnodeName = getBrokerZnodeName(s, webServiceUrl);
+ Map<String, String> map = new HashMap<>();
+ map.put(ResourceUnit.PROPERTY_KEY_BROKER_ZNODE_NAME, brokerZnodeName);
return new SimpleResourceUnit(webServiceUrl,
- new PulsarResourceDescription(), Map.of(ResourceUnit.PROPERTY_KEY_BROKER_ZNODE_NAME, brokerZnodeName));
+ new PulsarResourceDescription(), Collections.unmodifiableMap(map));
});
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TopicTransactionBufferRecoverTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TopicTransactionBufferRecoverTest.java
index dddda0f962d..fb2968acd88 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TopicTransactionBufferRecoverTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TopicTransactionBufferRecoverTest.java
@@ -495,7 +495,7 @@ public class TopicTransactionBufferRecoverTest extends TransactionTestBase {
doThrow(new RuntimeException("test")).when(reader).hasMoreEvents();
// check reader close topic
checkCloseTopic(pulsarClient, transactionBufferSnapshotServiceOriginal,
- transactionBufferSnapshotService, originalTopic, field, producer);
+ transactionBufferSnapshotService, originalTopic, field);
doReturn(true).when(reader).hasMoreEvents();
// mock reader can't read snapshot fail throw PulsarClientException