diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2008-03-03 20:13:55 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2008-03-03 20:13:55 +0000 |
| commit | 19c9b4d979b80251fdd5517b8070e93cd6ad7b23 (patch) | |
| tree | 5057f8cb4387872163f3185ea16082818f33d96e | |
| parent | 655e52b228ca233027f32ba54f7e94c88754a5c8 (diff) | |
| download | qpid-python-19c9b4d979b80251fdd5517b8070e93cd6ad7b23.tar.gz | |
QPID-828 : Stop transient message data being cleared while still delivering
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@633256 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java | 6 | ||||
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java index 6f40594cb4..ab503289ba 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java +++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java @@ -138,11 +138,9 @@ public class AMQMinaProtocolSession implements AMQProtocolSession, Managable catch (RuntimeException e) { e.printStackTrace(); - // throw e; + throw e; } - - // this(session, queueRegistry, exchangeRegistry, codecFactory, new AMQStateManager()); } public AMQMinaProtocolSession(IoSession session, VirtualHostRegistry virtualHostRegistry, AMQCodecFactory codecFactory, @@ -364,6 +362,8 @@ public class AMQMinaProtocolSession implements AMQProtocolSession, Managable listener.error(e); } + _logger.error("Unexpected exception while processing frame. Closing connection.", e); + _minaProtocolSession.close(); } } diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java index dcc2becbc5..f501bc27d1 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java +++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java @@ -657,8 +657,6 @@ public class AMQMessage // now that it has all been received, before we attempt delivery _txnContext.messageFullyReceived(isPersistent()); - _transientMessageData = null; - for (AMQQueue q : destinationQueues) { // Increment the references to this message for each queue delivery. |