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/11/09 15:46:00 UTC
qpid-broker-j git commit: QPID-8029: [Broker-J] [AMQP 0-8..0-91]
Attempting to tx.rollback on a non-transacted session should not try to
rollback
Repository: qpid-broker-j
Updated Branches:
refs/heads/master e3aa40d97 -> e3260f592
QPID-8029: [Broker-J] [AMQP 0-8..0-91] Attempting to tx.rollback on a non-transacted session should not try to rollback
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/e3260f59
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/e3260f59
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/e3260f59
Branch: refs/heads/master
Commit: e3260f592c9d8eb7165c896d1ba5724e61c36d92
Parents: e3aa40d
Author: Keith Wall <kw...@apache.org>
Authored: Thu Nov 9 15:42:05 2017 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Thu Nov 9 15:42:57 2017 +0000
----------------------------------------------------------------------
.../qpid/server/protocol/v0_8/AMQChannel.java | 22 +++++++-------------
1 file changed, 8 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e3260f59/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
index 3e47616..df9f946 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
@@ -3361,24 +3361,18 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
closeChannel(ErrorCodes.COMMAND_INVALID,
"Fatal error: rollback called on non-transactional channel");
}
-
- final MethodRegistry methodRegistry = _connection.getMethodRegistry();
- final AMQMethodBody responseBody = methodRegistry.createTxRollbackOkBody();
-
- Runnable task = new Runnable()
+ else
{
+ final MethodRegistry methodRegistry = _connection.getMethodRegistry();
+ final AMQMethodBody responseBody = methodRegistry.createTxRollbackOkBody();
- @Override
- public void run()
- {
- _connection.writeFrame(responseBody.generateFrame(_channelId));
- }
- };
+ Runnable task = () -> _connection.writeFrame(responseBody.generateFrame(_channelId));
- rollback(task);
+ rollback(task);
- // TODO: This is not spec compliant but we currently seem to rely on this behaviour
- resend();
+ // TODO: This is not spec compliant but we currently seem to rely on this behaviour
+ resend();
+ }
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org