Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for https://issues.apache.org/jira/browse/AMQ-5073

This commit is contained in:
Kevin Earls 2014-03-11 14:58:13 +01:00
parent a3a41dae37
commit c8a5fb769e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpNioTransportHelper.java
View File

@ -158,6 +158,7 @@ public class AmqpNioTransportHelper {
} else { } else {
transportSupport.doConsume(AmqpSupport.toBuffer(currentBuffer)); transportSupport.doConsume(AmqpSupport.toBuffer(currentBuffer));
} }
currentBuffer = null;
if (plain.hasRemaining()) { if (plain.hasRemaining()) {
if (plain.remaining() < 4) { if (plain.remaining() < 4) {
@ -167,8 +168,8 @@ public class AmqpNioTransportHelper {
} }
} else { } else {
nextFrameSize = -1; nextFrameSize = -1;
currentBuffer = null;
} }
return nextFrameSize; return nextFrameSize;
} }

1
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioTest.java
View File

@ -42,7 +42,6 @@ import org.objectweb.jtests.jms.conform.topic.TemporaryTopicTest;
/** /**
* Run the JoramJmsTests using amqp+nio * Run the JoramJmsTests using amqp+nio
*/ */
@Ignore("AMQ-5094")
@RunWith(Suite.class) @RunWith(Suite.class)
@Suite.SuiteClasses({ @Suite.SuiteClasses({
// TopicSessionTest.class, // Hangs, see https://issues.apache.org/jira/browse/PROTON-154 // TopicSessionTest.class, // Hangs, see https://issues.apache.org/jira/browse/PROTON-154