summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2010-06-10 12:43:47 +0100
committerEmile Joubert <emile@rabbitmq.com>2010-06-10 12:43:47 +0100
commit59802b4810af27ad3bea9c6fbe1077c352818684 (patch)
tree79bf0979d1c0714dd5c6fd31378edcc85b2cc3d3
parent6f0c1c01e078b134db75dde900e28def217908d3 (diff)
parent468861392342840b4bf3437f896fed3beca70a77 (diff)
downloadrabbitmq-server-59802b4810af27ad3bea9c6fbe1077c352818684.tar.gz
Merged bug22771 into default
-rw-r--r--src/rabbit_channel.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index f355bef3..21595f82 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -826,14 +826,14 @@ handle_method(#'tx.select'{}, _, State) ->
handle_method(#'tx.commit'{}, _, #ch{transaction_id = none}) ->
rabbit_misc:protocol_error(
- not_allowed, "channel is not transactional", []);
+ precondition_failed, "channel is not transactional", []);
handle_method(#'tx.commit'{}, _, State) ->
{reply, #'tx.commit_ok'{}, internal_commit(State)};
handle_method(#'tx.rollback'{}, _, #ch{transaction_id = none}) ->
rabbit_misc:protocol_error(
- not_allowed, "channel is not transactional", []);
+ precondition_failed, "channel is not transactional", []);
handle_method(#'tx.rollback'{}, _, State) ->
{reply, #'tx.rollback_ok'{}, internal_rollback(State)};