mirror of https://github.com/apache/activemq.git
AMQ-5738: Ensure the sender links for non-durable consumers also get unregistered, remove duplicate closed field, fix method names.
This commit is contained in:
parent
b313209aa2
commit
3a5f127d52
|
@ -563,11 +563,11 @@ public class AmqpConnection implements AmqpProtocolConverter {
|
|||
|
||||
//----- Utility methods for connection resources to use ------------------//
|
||||
|
||||
void regosterSender(ConsumerId consumerId, AmqpSender sender) {
|
||||
void registerSender(ConsumerId consumerId, AmqpSender sender) {
|
||||
subscriptionsByConsumerId.put(consumerId, sender);
|
||||
}
|
||||
|
||||
void unregosterSender(ConsumerId consumerId) {
|
||||
void unregisterSender(ConsumerId consumerId) {
|
||||
subscriptionsByConsumerId.remove(consumerId);
|
||||
}
|
||||
|
||||
|
|
|
@ -80,7 +80,6 @@ public class AmqpSender extends AmqpAbstractLink<Sender> {
|
|||
private final ConsumerInfo consumerInfo;
|
||||
private final boolean presettle;
|
||||
|
||||
private boolean closed;
|
||||
private int currentCredit;
|
||||
private boolean draining;
|
||||
private long lastDeliveredSequenceId;
|
||||
|
@ -108,8 +107,8 @@ public class AmqpSender extends AmqpAbstractLink<Sender> {
|
|||
|
||||
@Override
|
||||
public void open() {
|
||||
if (!closed) {
|
||||
session.regosterSender(getConsumerId(), this);
|
||||
if (!isClosed()) {
|
||||
session.registerSender(getConsumerId(), this);
|
||||
}
|
||||
|
||||
super.open();
|
||||
|
@ -142,9 +141,9 @@ public class AmqpSender extends AmqpAbstractLink<Sender> {
|
|||
rsi.setClientId(session.getConnection().getClientId());
|
||||
|
||||
sendToActiveMQ(rsi, null);
|
||||
|
||||
session.unregisterSender(getConsumerId());
|
||||
}
|
||||
|
||||
session.unregisterSender(getConsumerId());
|
||||
}
|
||||
|
||||
super.close();
|
||||
|
@ -350,7 +349,7 @@ public class AmqpSender extends AmqpAbstractLink<Sender> {
|
|||
//----- Internal Implementation ------------------------------------------//
|
||||
|
||||
public void pumpOutbound() throws Exception {
|
||||
while (!closed) {
|
||||
while (!isClosed()) {
|
||||
while (currentBuffer != null) {
|
||||
int sent = getEndpoint().send(currentBuffer.data, currentBuffer.offset, currentBuffer.length);
|
||||
if (sent > 0) {
|
||||
|
|
|
@ -345,14 +345,14 @@ public class AmqpSession implements AmqpResource {
|
|||
connection.pumpProtonToSocket();
|
||||
}
|
||||
|
||||
public void regosterSender(ConsumerId consumerId, AmqpSender sender) {
|
||||
public void registerSender(ConsumerId consumerId, AmqpSender sender) {
|
||||
consumers.put(consumerId, sender);
|
||||
connection.regosterSender(consumerId, sender);
|
||||
connection.registerSender(consumerId, sender);
|
||||
}
|
||||
|
||||
public void unregisterSender(ConsumerId consumerId) {
|
||||
consumers.remove(consumerId);
|
||||
connection.unregosterSender(consumerId);
|
||||
connection.unregisterSender(consumerId);
|
||||
}
|
||||
|
||||
//----- Configuration accessors ------------------------------------------//
|
||||
|
|
Loading…
Reference in New Issue