Author: rgodfrey
Date: Mon Mar 3 12:13:55 2008
New Revision: 633256
URL: http://svn.apache.org/viewvc?rev=633256&view=rev
Log:
QPID-828 : Stop transient message data being cleared while still delivering
Modified:
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
Modified:
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java?rev=633256&r1=633255&r2=633256&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
(original)
+++
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
Mon Mar 3 12:13:55 2008
@@ -138,11 +138,9 @@
catch (RuntimeException e)
{
e.printStackTrace();
- // throw e;
+ throw e;
}
-
- // this(session, queueRegistry, exchangeRegistry, codecFactory, new
AMQStateManager());
}
public AMQMinaProtocolSession(IoSession session, VirtualHostRegistry
virtualHostRegistry, AMQCodecFactory codecFactory,
@@ -363,6 +361,8 @@
{
listener.error(e);
}
+
+ _logger.error("Unexpected exception while processing frame.
Closing connection.", e);
_minaProtocolSession.close();
}
Modified:
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java?rev=633256&r1=633255&r2=633256&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
(original)
+++
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
Mon Mar 3 12:13:55 2008
@@ -657,8 +657,6 @@
// 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.
