You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/06/29 17:02:37 UTC
qpid-broker-j git commit: QPID-7842: Remove remains of previous
client-side transactional retirement transaction implementation
(_flowTransactionId etc)
Repository: qpid-broker-j
Updated Branches:
refs/heads/master cdb696a9b -> 403a725ab
QPID-7842: Remove remains of previous client-side transactional retirement transaction implementation (_flowTransactionId etc)
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/403a725a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/403a725a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/403a725a
Branch: refs/heads/master
Commit: 403a725ab8f64acb30688f09adee5c66d3816c81
Parents: cdb696a
Author: Keith Wall <kw...@apache.org>
Authored: Thu Jun 29 17:53:28 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Thu Jun 29 18:02:08 2017 +0100
----------------------------------------------------------------------
.../protocol/v1_0/AbstractLinkEndpoint.java | 35 ++++----------------
.../protocol/v1_0/SendingLinkEndpoint.java | 6 ++--
2 files changed, 10 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/403a725a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AbstractLinkEndpoint.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AbstractLinkEndpoint.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AbstractLinkEndpoint.java
index a02a297..55432c9 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AbstractLinkEndpoint.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AbstractLinkEndpoint.java
@@ -52,8 +52,6 @@ public abstract class AbstractLinkEndpoint<S extends BaseSource, T extends BaseT
private final Link_1_0<S, T> _link;
private final Session_1_0 _session;
- // todo: remove client specific part
- private Object _flowTransactionId;
private volatile SenderSettleMode _sendingSettlementMode;
private volatile ReceiverSettleMode _receivingSettlementMode;
private volatile UnsignedInteger _lastSentCreditLimit;
@@ -388,18 +386,13 @@ public abstract class AbstractLinkEndpoint<S extends BaseSource, T extends BaseT
setLocalHandle(null);
}
- public void setTransactionId(final Object txnId)
- {
- _flowTransactionId = txnId;
- }
-
public void sendFlowConditional()
{
if(_lastSentCreditLimit != null)
{
if(_stoppedUpdated)
{
- sendFlow(_flowTransactionId != null);
+ sendFlow(false);
_stoppedUpdated = false;
}
else
@@ -410,7 +403,7 @@ public abstract class AbstractLinkEndpoint<S extends BaseSource, T extends BaseT
boolean sendFlow = _linkCredit.subtract(clientsCredit).compareTo(clientsCredit) >= 0;
if (sendFlow)
{
- sendFlow(_flowTransactionId != null);
+ sendFlow(false);
}
else
{
@@ -420,7 +413,7 @@ public abstract class AbstractLinkEndpoint<S extends BaseSource, T extends BaseT
}
else
{
- sendFlow(_flowTransactionId != null);
+ sendFlow(false);
}
}
@@ -428,21 +421,10 @@ public abstract class AbstractLinkEndpoint<S extends BaseSource, T extends BaseT
@Override
public void sendFlow()
{
- sendFlow(_flowTransactionId != null);
+ sendFlow(false);
}
- public void sendFlowWithEcho()
- {
- sendFlow(_flowTransactionId != null, true);
- }
-
-
- public void sendFlow(boolean setTransactionId)
- {
- sendFlow(setTransactionId, false);
- }
-
- public void sendFlow(boolean setTransactionId, boolean echo)
+ private void sendFlow(boolean echo)
{
if(_state == State.ATTACHED || _state == State.ATTACH_SENT)
{
@@ -462,10 +444,6 @@ public abstract class AbstractLinkEndpoint<S extends BaseSource, T extends BaseT
flow.setDrain(_drain);
}
flow.setAvailable(_available);
- if(setTransactionId)
- {
- flow.setProperties(Collections.singletonMap(Symbol.valueOf("txn-id"), _flowTransactionId));
- }
flow.setHandle(getLocalHandle());
getSession().sendFlow(flow);
}
@@ -498,7 +476,8 @@ public abstract class AbstractLinkEndpoint<S extends BaseSource, T extends BaseT
_capabilities = capabilities == null ? null : capabilities.toArray(new Symbol[capabilities.size()]);
}
- @Override public String toString()
+ @Override
+ public String toString()
{
return "LinkEndpoint{" +
"_name='" + getLinkName() + '\'' +
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/403a725a/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 95dc34b..e6763eb 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
@@ -411,10 +411,10 @@ public class SendingLinkEndpoint extends AbstractLinkEndpoint<Source, Target>
UnsignedInteger receiverLinkCredit = flow.getLinkCredit();
setDrain(flow.getDrain());
- Map options;
- if((options = flow.getProperties()) != null)
+ Map<Symbol, Object> properties = flow.getProperties();
+ if (properties != null)
{
- _transactionId = (Binary) options.get(Symbol.valueOf("txn-id"));
+ _transactionId = (Binary) properties.get(Symbol.valueOf("txn-id"));
}
if(receiverDeliveryCount == null)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org