You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2015/02/23 23:02:52 UTC
[1/3] qpid-jms git commit: consolidate endpoint close handling into
the abstract resource
Repository: qpid-jms
Updated Branches:
refs/heads/master 5ac9504f7 -> 989bce31b
consolidate endpoint close handling into the abstract resource
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/bcae5e01
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/bcae5e01
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/bcae5e01
Branch: refs/heads/master
Commit: bcae5e018a83955c7d9f4ef69ad6fc03e85d59a0
Parents: 5ac9504
Author: Timothy Bish <ta...@gmail.com>
Authored: Mon Feb 23 15:32:46 2015 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon Feb 23 15:32:46 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/qpid/jms/JmsConnection.java | 10 +++----
.../jms/provider/amqp/AmqpAbstractResource.java | 12 ++++++--
.../qpid/jms/provider/amqp/AmqpConnection.java | 29 ++------------------
3 files changed, 17 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/bcae5e01/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
index b449bb0..0b73cb4 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
@@ -1099,6 +1099,11 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
}
}
+ @Override
+ public void onResourceRemotelyClosed(JmsResource resource, Exception cause) {
+ LOG.info("A JMS resource has been remotely closed: {}", resource);
+ }
+
/**
* Handles any asynchronous errors that occur from the JMS framework classes.
*
@@ -1129,11 +1134,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
}
}
- @Override
- public void onResourceRemotelyClosed(JmsResource resource, Exception cause) {
- LOG.info("A JMS resource has been remotely closed: {}", resource);
- }
-
protected void providerFailed(IOException error) {
failed.set(true);
if (firstFailureError == null) {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/bcae5e01/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
index dbadbca..075986f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
@@ -258,11 +258,17 @@ public abstract class AmqpAbstractResource<R extends JmsResource, E extends Endp
if (isAwaitingClose()) {
LOG.debug("{} is now closed: ", this);
closed();
- } else if (isAwaitingOpen() && hasRemoteError()) {
+ } else if (isAwaitingOpen()) {
// Error on Open, create exception and signal failure.
LOG.warn("Open of {} failed: ", this);
- Exception remoteError = this.getRemoteError();
- failed(remoteError);
+ Exception openError;
+ if (hasRemoteError()) {
+ openError = this.getRemoteError();
+ } else {
+ openError = new IOException("Open failed unexpectedly.");
+ }
+
+ failed(openError);
} else {
remotelyClosed();
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/bcae5e01/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
index 81bdd21..38d40c6 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
@@ -16,6 +16,7 @@
*/
package org.apache.qpid.jms.provider.amqp;
+import java.io.IOException;
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
@@ -33,7 +34,6 @@ import org.apache.qpid.jms.provider.AsyncResult;
import org.apache.qpid.jms.provider.amqp.message.AmqpJmsMessageFactory;
import org.apache.qpid.jms.util.IOExceptionSupport;
import org.apache.qpid.proton.engine.Connection;
-import org.apache.qpid.proton.engine.EndpointState;
import org.apache.qpid.proton.engine.Sasl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -119,7 +119,7 @@ public class AmqpConnection extends AmqpAbstractResource<JmsConnectionInfo, Conn
* side of the Connection.
*/
@Override
- public void processStateChange() {
+ public void processStateChange() throws IOException {
if (!connected && isOpen()) {
connected = true;
@@ -147,30 +147,7 @@ public class AmqpConnection extends AmqpAbstractResource<JmsConnectionInfo, Conn
});
}
- EndpointState localState = getEndpoint().getLocalState();
- EndpointState remoteState = getEndpoint().getRemoteState();
-
- // We are still active (connected or not) and something on the remote end has
- // closed us, signal an error if one was sent.
- if (localState == EndpointState.ACTIVE && remoteState != EndpointState.ACTIVE) {
- if (getEndpoint().getRemoteCondition().getCondition() != null) {
- LOG.info("Error condition detected on Connection open {}.", getEndpoint().getRemoteCondition().getCondition());
- Exception remoteError = getRemoteError();
- if (isAwaitingOpen()) {
- doClose();
- openRequest.onFailure(remoteError);
- } else {
- doClose();
- provider.fireProviderException(remoteError);
- }
- }
- }
-
- // Transition cleanly to closed state.
- if (localState == EndpointState.CLOSED && remoteState == EndpointState.CLOSED) {
- LOG.debug("{} has been closed successfully.", this);
- closed();
- }
+ super.processStateChange();
}
public void processSaslAuthentication() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-jms git commit: Pass the provider to all the state update
methods to make it simpler to fire events from them,
also ensure all overrides call the base.
Posted by ta...@apache.org.
Pass the provider to all the state update methods to make it simpler to
fire events from them, also ensure all overrides call the base.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/5f4acf8e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/5f4acf8e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/5f4acf8e
Branch: refs/heads/master
Commit: 5f4acf8e93c671f6fc31314d2308de6b696636f1
Parents: bcae5e0
Author: Timothy Bish <ta...@gmail.com>
Authored: Mon Feb 23 16:52:12 2015 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon Feb 23 16:52:12 2015 -0500
----------------------------------------------------------------------
.../qpid/jms/provider/amqp/AmqpAbstractResource.java | 6 +++---
.../qpid/jms/provider/amqp/AmqpConnection.java | 4 ++--
.../apache/qpid/jms/provider/amqp/AmqpConsumer.java | 8 +++++---
.../qpid/jms/provider/amqp/AmqpFixedProducer.java | 8 ++++++--
.../apache/qpid/jms/provider/amqp/AmqpProvider.java | 14 +++++++-------
.../qpid/jms/provider/amqp/AmqpQueueBrowser.java | 8 ++++----
.../apache/qpid/jms/provider/amqp/AmqpResource.java | 15 ++++++++++++---
.../jms/provider/amqp/AmqpTemporaryDestination.java | 2 +-
.../jms/provider/amqp/AmqpTransactionContext.java | 4 +++-
9 files changed, 43 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5f4acf8e/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
index 075986f..6612786 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
@@ -246,7 +246,7 @@ public abstract class AmqpAbstractResource<R extends JmsResource, E extends Endp
}
@Override
- public void processStateChange() throws IOException {
+ public void processStateChange(AmqpProvider provider) throws IOException {
EndpointState remoteState = getEndpoint().getRemoteState();
if (remoteState == EndpointState.ACTIVE) {
@@ -276,11 +276,11 @@ public abstract class AmqpAbstractResource<R extends JmsResource, E extends Endp
}
@Override
- public void processDeliveryUpdates() throws IOException {
+ public void processDeliveryUpdates(AmqpProvider provider) throws IOException {
}
@Override
- public void processFlowUpdates() throws IOException {
+ public void processFlowUpdates(AmqpProvider provider) throws IOException {
}
/**
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5f4acf8e/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
index 38d40c6..a17f1d4 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
@@ -119,7 +119,7 @@ public class AmqpConnection extends AmqpAbstractResource<JmsConnectionInfo, Conn
* side of the Connection.
*/
@Override
- public void processStateChange() throws IOException {
+ public void processStateChange(AmqpProvider provider) throws IOException {
if (!connected && isOpen()) {
connected = true;
@@ -147,7 +147,7 @@ public class AmqpConnection extends AmqpAbstractResource<JmsConnectionInfo, Conn
});
}
- super.processStateChange();
+ super.processStateChange(provider);
}
public void processSaslAuthentication() {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5f4acf8e/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
index a519e42..1f4fbd1 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
@@ -129,7 +129,7 @@ public class AmqpConsumer extends AmqpAbstractResource<JmsConsumerInfo, Receiver
}
@Override
- public void processFlowUpdates() throws IOException {
+ public void processFlowUpdates(AmqpProvider provider) throws IOException {
// Check if we tried to stop and have now run out of credit, and
// processed all locally queued messages
if (stopRequest != null) {
@@ -140,7 +140,7 @@ public class AmqpConsumer extends AmqpAbstractResource<JmsConsumerInfo, Receiver
}
}
- super.processFlowUpdates();
+ super.processFlowUpdates(provider);
}
@Override
@@ -365,7 +365,7 @@ public class AmqpConsumer extends AmqpAbstractResource<JmsConsumerInfo, Receiver
}
@Override
- public void processDeliveryUpdates() throws IOException {
+ public void processDeliveryUpdates(AmqpProvider provider) throws IOException {
Delivery incoming = null;
do {
incoming = getEndpoint().current();
@@ -394,6 +394,8 @@ public class AmqpConsumer extends AmqpAbstractResource<JmsConsumerInfo, Receiver
}
}
} while (incoming != null);
+
+ super.processDeliveryUpdates(provider);
}
private void processDelivery(Delivery incoming) throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5f4acf8e/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
----------------------------------------------------------------------
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 aefc222..3fd6035 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
@@ -169,7 +169,7 @@ public class AmqpFixedProducer extends AmqpProducer {
}
@Override
- public void processFlowUpdates() throws IOException {
+ public void processFlowUpdates(AmqpProvider provider) throws IOException {
if (!pendingSends.isEmpty() && getEndpoint().getCredit() > 0) {
while (getEndpoint().getCredit() > 0 && !pendingSends.isEmpty()) {
LOG.trace("Dispatching previously held send");
@@ -186,10 +186,12 @@ public class AmqpFixedProducer extends AmqpProducer {
if (pendingSends.isEmpty() && isAwaitingClose()) {
super.close(closeRequest);
}
+
+ super.processFlowUpdates(provider);
}
@Override
- public void processDeliveryUpdates() {
+ public void processDeliveryUpdates(AmqpProvider provider) throws IOException {
List<Delivery> toRemove = new ArrayList<Delivery>();
for (Delivery delivery : pending) {
@@ -234,6 +236,8 @@ public class AmqpFixedProducer extends AmqpProducer {
}
pending.removeAll(toRemove);
+
+ super.processDeliveryUpdates(provider);
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5f4acf8e/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
index d826a4e..3c4cae6 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
@@ -718,34 +718,34 @@ public class AmqpProvider implements Provider, TransportListener {
case CONNECTION_REMOTE_CLOSE:
case CONNECTION_REMOTE_OPEN:
AmqpConnection connection = (AmqpConnection) protonEvent.getConnection().getContext();
- connection.processStateChange();
+ connection.processStateChange(this);
break;
case SESSION_REMOTE_CLOSE:
case SESSION_REMOTE_OPEN:
AmqpSession session = (AmqpSession) protonEvent.getSession().getContext();
- session.processStateChange();
+ session.processStateChange(this);
break;
case LINK_REMOTE_CLOSE:
LOG.info("Link closed: {}", protonEvent.getLink().getContext());
AmqpResource cloedResource = (AmqpResource) protonEvent.getLink().getContext();
- cloedResource.processStateChange();
+ cloedResource.processStateChange(this);
break;
case LINK_REMOTE_DETACH:
LOG.info("Link detach: {}", protonEvent.getLink().getContext());
AmqpResource detachedResource = (AmqpResource) protonEvent.getLink().getContext();
- detachedResource.processStateChange();
+ detachedResource.processStateChange(this);
break;
case LINK_REMOTE_OPEN:
AmqpResource resource = (AmqpResource) protonEvent.getLink().getContext();
- resource.processStateChange();
+ resource.processStateChange(this);
break;
case LINK_FLOW:
amqpResource = (AmqpResource) protonEvent.getLink().getContext();
- amqpResource.processFlowUpdates();
+ amqpResource.processFlowUpdates(this);
break;
case DELIVERY:
amqpResource = (AmqpResource) protonEvent.getLink().getContext();
- amqpResource.processDeliveryUpdates();
+ amqpResource.processDeliveryUpdates(this);
break;
default:
break;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5f4acf8e/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpQueueBrowser.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpQueueBrowser.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpQueueBrowser.java
index df52c7e..245f938 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpQueueBrowser.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpQueueBrowser.java
@@ -63,7 +63,7 @@ public class AmqpQueueBrowser extends AmqpConsumer {
}
@Override
- public void processFlowUpdates() throws IOException {
+ public void processFlowUpdates(AmqpProvider provider) throws IOException {
if (getEndpoint().getDrain() && getEndpoint().getCredit() == getEndpoint().getRemoteCredit()) {
JmsInboundMessageDispatch browseDone = new JmsInboundMessageDispatch(getNextIncomingSequenceNumber());
browseDone.setConsumerId(getConsumerId());
@@ -76,17 +76,17 @@ public class AmqpQueueBrowser extends AmqpConsumer {
getEndpoint().setDrain(false);
}
- super.processFlowUpdates();
+ super.processFlowUpdates(provider);
}
@Override
- public void processDeliveryUpdates() throws IOException {
+ public void processDeliveryUpdates(AmqpProvider provider) throws IOException {
if (getEndpoint().getDrain() && getEndpoint().current() != null) {
LOG.trace("{} incoming delivery, cancel drain.", getConsumerId());
getEndpoint().setDrain(false);
}
- super.processDeliveryUpdates();
+ super.processDeliveryUpdates(provider);
if (getEndpoint().getDrain() && getEndpoint().getCredit() == getEndpoint().getRemoteCredit()) {
JmsInboundMessageDispatch browseDone = new JmsInboundMessageDispatch(getNextIncomingSequenceNumber());
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5f4acf8e/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpResource.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpResource.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpResource.java
index c4d33fe..f577b21 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpResource.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpResource.java
@@ -104,25 +104,34 @@ public interface AmqpResource {
* Called when the Proton Engine signals that the state of the given resource has
* changed on the remote side.
*
+ * @param provider
+ * the AmqpProvider instance for easier access to fire events.
+ *
* @throws IOException if an error occurs while processing the update.
*/
- void processStateChange() throws IOException;
+ void processStateChange(AmqpProvider provider) throws IOException;
/**
* Called when the Proton Engine signals an Delivery related event has been triggered
* for the given endpoint.
*
+ * @param provider
+ * the AmqpProvider instance for easier access to fire events.
+ *
* @throws IOException if an error occurs while processing the update.
*/
- void processDeliveryUpdates() throws IOException;
+ void processDeliveryUpdates(AmqpProvider provider) throws IOException;
/**
* Called when the Proton Engine signals an Flow related event has been triggered
* for the given endpoint.
*
+ * @param provider
+ * the AmqpProvider instance for easier access to fire events.
+ *
* @throws IOException if an error occurs while processing the update.
*/
- void processFlowUpdates() throws IOException;
+ void processFlowUpdates(AmqpProvider provider) throws IOException;
/**
* @returns true if the remote end has sent an error
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5f4acf8e/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
index e41b038..ea105e3 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
@@ -65,7 +65,7 @@ public class AmqpTemporaryDestination extends AmqpAbstractResource<JmsTemporaryD
}
@Override
- public void processStateChange() {
+ public void processStateChange(AmqpProvider provider) {
// TODO - We might want to check on our producer to see if it becomes closed
// which might indicate that the broker purged the temporary destination.
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5f4acf8e/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java
index 3326bd4..f145f0a 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java
@@ -79,7 +79,7 @@ public class AmqpTransactionContext extends AmqpAbstractResource<JmsSessionInfo,
}
@Override
- public void processDeliveryUpdates() throws IOException {
+ public void processDeliveryUpdates(AmqpProvider provider) throws IOException {
try {
if (pendingDelivery != null && pendingDelivery.remotelySettled()) {
DeliveryState state = pendingDelivery.getRemoteState();
@@ -121,6 +121,8 @@ public class AmqpTransactionContext extends AmqpAbstractResource<JmsSessionInfo,
request.onSuccess();
}
}
+
+ super.processDeliveryUpdates(provider);
} catch (Exception e) {
throw IOExceptionSupport.create(e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-jms git commit: delegate back to superclass.
Posted by ta...@apache.org.
delegate back to superclass.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/989bce31
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/989bce31
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/989bce31
Branch: refs/heads/master
Commit: 989bce31b2c0404d5760044c97667f19123a8c52
Parents: 5f4acf8
Author: Timothy Bish <ta...@gmail.com>
Authored: Mon Feb 23 17:02:35 2015 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon Feb 23 17:02:35 2015 -0500
----------------------------------------------------------------------
.../jms/provider/amqp/AmqpTemporaryDestination.java | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/989bce31/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
index ea105e3..d96099a 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
@@ -16,6 +16,7 @@
*/
package org.apache.qpid.jms.provider.amqp;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -30,7 +31,6 @@ import org.apache.qpid.proton.amqp.messaging.TerminusDurability;
import org.apache.qpid.proton.amqp.messaging.TerminusExpiryPolicy;
import org.apache.qpid.proton.amqp.transport.ReceiverSettleMode;
import org.apache.qpid.proton.amqp.transport.SenderSettleMode;
-import org.apache.qpid.proton.engine.EndpointState;
import org.apache.qpid.proton.engine.Sender;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,18 +65,11 @@ public class AmqpTemporaryDestination extends AmqpAbstractResource<JmsTemporaryD
}
@Override
- public void processStateChange(AmqpProvider provider) {
+ public void processStateChange(AmqpProvider provider) throws IOException {
// TODO - We might want to check on our producer to see if it becomes closed
// which might indicate that the broker purged the temporary destination.
- EndpointState remoteState = getEndpoint().getRemoteState();
- if (remoteState == EndpointState.ACTIVE) {
- LOG.trace("Temporary Destination: {} is now open", this.resource);
- opened();
- } else if (remoteState == EndpointState.CLOSED) {
- LOG.trace("Temporary Destination: {} is now closed", this.resource);
- closed();
- }
+ super.processStateChange(provider);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org