[qpid-jms] 02/02: QPIDJMS-469 Remove some unused variabels and code blocks

[ta...@apache.org]

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

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git

commit 699f5549da1d47c7409f16d3e99f0dba2d225e32
Author: Timothy Bish <ta...@gmail.com>
AuthorDate: Fri Aug 2 14:58:22 2019 -0400

    QPIDJMS-469 Remove some unused variabels and code blocks
    
    Removes an unused atomic boolean in the consumer and a no longer used
    async result and set block that is no longer used by the producer
---
 .../src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java    | 1 -
 .../org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java     | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
index a437f76..7cec9b5 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
@@ -69,7 +69,6 @@ public class JmsMessageConsumer implements AutoCloseable, MessageConsumer, JmsMe
     protected final MessageQueue messageQueue;
     protected final Lock lock = new ReentrantLock();
     protected final Lock dispatchLock = new ReentrantLock();
-    protected final AtomicBoolean suspendedConnection = new AtomicBoolean();
     protected final AtomicReference<Throwable> failureCause = new AtomicReference<>();
     protected final MessageDeliverTask deliveryTask = new MessageDeliverTask();
 
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
index d54f1f4..3c79fd7 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
@@ -63,8 +63,6 @@ public class AmqpFixedProducer extends AmqpProducer {
     private final Map<Object, InFlightSend> sent = new LinkedHashMap<Object, InFlightSend>();
     private final Map<Object, InFlightSend> blocked = new LinkedHashMap<Object, InFlightSend>();
 
-    private AsyncResult sendCompletionWatcher;
-
     private final AmqpConnection connection;
 
     public AmqpFixedProducer(AmqpSession session, JmsProducerInfo info, Sender sender) {
@@ -404,13 +402,6 @@ public class AmqpFixedProducer extends AmqpProducer {
             // Put the message back to usable state following send complete
             envelope.getMessage().onSendComplete();
 
-            // Signal the watcher that all pending sends have completed if one is registered
-            // and both the in-flight sends and blocked sends have completed.
-            if (sendCompletionWatcher != null && sent.isEmpty() && blocked.isEmpty()) {
-                sendCompletionWatcher.onSuccess();
-                sendCompletionWatcher = null;
-            }
-
             // Once the pending sends queue is drained and all in-flight sends have been
             // settled we can propagate the close request.
             if (isAwaitingClose() && !isClosed() && blocked.isEmpty() && sent.isEmpty()) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org