You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/10/05 19:20:10 UTC
[08/10] qpid-broker-j git commit: QPID-7531: [Java Broker,
AMQP 1.0] Improve links recovering
QPID-7531: [Java Broker, AMQP 1.0] Improve links recovering
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/016279fa
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/016279fa
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/016279fa
Branch: refs/heads/master
Commit: 016279faac0cd0feb2a1208b3ae2bf6d5edadcfb
Parents: 1032515
Author: Lorenz Quack <lq...@apache.org>
Authored: Thu Oct 5 12:10:00 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Thu Oct 5 20:16:41 2017 +0100
----------------------------------------------------------------------
.../server/protocol/v1_0/SendingLinkEndpoint.java | 6 ++----
.../protocol/v1_0/StandardReceivingLinkEndpoint.java | 14 ++------------
2 files changed, 4 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/016279fa/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
index 1a46c4e..222074e 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
@@ -361,10 +361,8 @@ public class SendingLinkEndpoint extends AbstractLinkEndpoint<Source, Target>
throw new AmqpErrorException(new Error(AmqpError.NOT_FOUND, ""));
}
- final SendingDestination destination = getSession().getSendingDestination(getLink(), getSource());
- prepareConsumerOptionsAndFilters(destination);
-
- attachReceived(attach);
+ attach.setSource(getSource());
+ receiveAttach(attach);
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/016279fa/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
index c744437..fd98eed 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
@@ -485,18 +485,8 @@ public class StandardReceivingLinkEndpoint extends AbstractReceivingLinkEndpoint
String.format("Link '%s' not found", getLinkName())));
}
- Source source = (Source) attach.getSource();
- Target target = getTarget();
-
- // TODO: This seems a bit weird. Similar code is in attachReceived.
- // We also seem to send back a different target than we are using.
- final ReceivingDestination destination = getSession().getReceivingDestination(getLink(), getTarget());
- target.setCapabilities(destination.getCapabilities());
- setCapabilities(Arrays.asList(destination.getCapabilities()));
- setDestination(destination);
- attachReceived(attach);
-
- getLink().setTermini(source, target);
+ attach.setTarget(getTarget());
+ receiveAttach(attach);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org