diff options
| author | Alex Rudyy <orudyy@apache.org> | 2014-08-28 15:00:06 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2014-08-28 15:00:06 +0000 |
| commit | e6a075f7373351710e320ae385beaf68ae404300 (patch) | |
| tree | 0e0b8866df642b942328a04c7e5317f3d69878ea /qpid/java/broker-plugins | |
| parent | 64f8ac4fd226e9201fad685efea5a3332a30e262 (diff) | |
| download | qpid-python-e6a075f7373351710e320ae385beaf68ae404300.tar.gz | |
QPID-6051: Allow exceptions from post commit actions to be handled in the callers
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1621146 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
| -rw-r--r-- | qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java index c193491e1e..3089895c06 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java @@ -318,7 +318,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi } break; } - catch (Exception e) + catch (AMQException e) { _logger.error("Unexpected exception when processing datablock", e); closeProtocolSession(); @@ -337,6 +337,11 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi _logger.error("Unexpected protocol version", e); closeProtocolSession(); } + catch (TransportException e) + { + _logger.error("Unexpected transport exception", e); + closeProtocolSession(); + } catch (AMQFrameDecodingException e) { _logger.error("Frame decoding", e); @@ -394,7 +399,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi * the connection is already closed by the time the exception is thrown. If any other * type of exception is thrown, the connection is not already closed. */ - private void dataBlockReceived(AMQDataBlock message) throws Exception + private void dataBlockReceived(AMQDataBlock message) throws AMQException { if (message instanceof ProtocolInitiation) { |