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/31 13:06:35 UTC
qpid-broker-j git commit: QPID-7994: [Broker-J][AMQP 1.0] Make sure
global shared durable subscriptions takes a copy of the terminus
Repository: qpid-broker-j
Updated Branches:
refs/heads/master f21917c7f -> 1c45ab933
QPID-7994: [Broker-J][AMQP 1.0] Make sure global shared durable subscriptions takes a copy of the terminus
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/1c45ab93
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/1c45ab93
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/1c45ab93
Branch: refs/heads/master
Commit: 1c45ab9337ccee3db40a381d0a850805c5ce16f3
Parents: f21917c
Author: Alex Rudyy <or...@apache.org>
Authored: Tue Oct 31 13:06:13 2017 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue Oct 31 13:06:13 2017 +0000
----------------------------------------------------------------------
.../protocol/v1_0/SendingLinkEndpoint.java | 14 +++++------
.../protocol/v1_0/type/messaging/Source.java | 26 ++++++++++++++++++++
2 files changed, 32 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1c45ab93/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 743715a..cd3cf21 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
@@ -372,15 +372,13 @@ public class SendingLinkEndpoint extends AbstractLinkEndpoint<Source, Target>
links = namedAddressSpace.findSendingLinks(getLinkName());
for (Link_1_0<? extends BaseSource, ? extends BaseTarget> link : links)
{
- if (link.getSource() != null)
+ BaseSource baseSource = link.getSource();
+ if (baseSource instanceof Source)
{
- BaseSource baseSource = link.getSource();
- if (baseSource instanceof Source)
- {
- source = ((Source) baseSource);
- getLink().setSource(source);
- break;
- }
+ Source linkSource = (Source) baseSource;
+ source = new Source(linkSource);
+ getLink().setSource(source);
+ break;
}
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1c45ab93/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Source.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Source.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Source.java
index a8537db..47e67d8 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Source.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Source.java
@@ -25,6 +25,7 @@ package org.apache.qpid.server.protocol.v1_0.type.messaging;
import java.util.Arrays;
+import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.qpid.server.protocol.v1_0.CompositeType;
@@ -71,6 +72,31 @@ public class Source implements BaseSource
@CompositeTypeField(index = 10)
private Symbol[] _capabilities;
+ public Source()
+ {
+ super();
+ }
+
+ public Source(final Source source)
+ {
+ super();
+ _address = source.getAddress();
+ _durable = source.getDurable();
+ _expiryPolicy = source.getExpiryPolicy();
+ _timeout = source.getTimeout();
+ _dynamic = source.getDynamic();
+ Map<Symbol, Object> dynamicNodeProperties = source.getDynamicNodeProperties();
+ _dynamicNodeProperties = dynamicNodeProperties == null ? null : new LinkedHashMap<>(dynamicNodeProperties);
+ _distributionMode = source.getDistributionMode();
+ Map<Symbol, Filter> filter = source.getFilter();
+ _filter = filter == null ? null : new LinkedHashMap<>(filter);
+ _defaultOutcome = source.getDefaultOutcome();
+ Symbol[] outcomes = source.getOutcomes();
+ _outcomes = outcomes == null ? null : Arrays.copyOf(outcomes, outcomes.length);;
+ Symbol[] capabilities = source.getCapabilities();
+ _capabilities = capabilities == null ? null : Arrays.copyOf(capabilities, capabilities.length);
+ }
+
public String getAddress()
{
return _address;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org