Skip to content

Commit 33ed29e

Browse files
committed
fix nullptr construction
1 parent 20d0b07 commit 33ed29e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lib/ConsumerImpl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1313,7 +1313,7 @@ void ConsumerImpl::negativeAcknowledge(const MessageId& messageId) {
13131313
negativeAcksTracker_->add(messageId);
13141314
}
13151315

1316-
void ConsumerImpl::disconnectConsumer() { disconnectConsumer(nullptr); }
1316+
void ConsumerImpl::disconnectConsumer() { disconnectConsumer(optional<std::string>{}); }
13171317

13181318
void ConsumerImpl::disconnectConsumer(const optional<std::string>& assignedBrokerUrl) {
13191319
LOG_INFO("Broker notification of Closed consumer: "

lib/HandlerBase.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void HandlerBase::setCnx(const ClientConnectionPtr& cnx) {
8585
connection_ = cnx;
8686
}
8787

88-
void HandlerBase::grabCnx() { grabCnx(nullptr); }
88+
void HandlerBase::grabCnx() { grabCnx(optional<std::string>{}); }
8989

9090
Future<Result, ClientConnectionPtr> HandlerBase::getConnection(
9191
const ClientImplPtr& client, const optional<std::string>& assignedBrokerUrl) {
@@ -176,7 +176,7 @@ void HandlerBase::handleDisconnection(Result result, const ClientConnectionPtr&
176176
break;
177177
}
178178
}
179-
void HandlerBase::scheduleReconnection() { scheduleReconnection(nullptr); }
179+
void HandlerBase::scheduleReconnection() { scheduleReconnection(optional<std::string>{}); }
180180
void HandlerBase::scheduleReconnection(const optional<std::string>& assignedBrokerUrl) {
181181
const auto state = state_.load();
182182

lib/ProducerImpl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ void ProducerImpl::disconnectProducer(const optional<std::string>& assignedBroke
981981
scheduleReconnection(assignedBrokerUrl);
982982
}
983983

984-
void ProducerImpl::disconnectProducer() { disconnectProducer(nullptr); }
984+
void ProducerImpl::disconnectProducer() { disconnectProducer(optional<std::string>{}); }
985985

986986
void ProducerImpl::start() {
987987
HandlerBase::start();

0 commit comments

Comments
 (0)