activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kea...@apache.org
Subject git commit: Fix for https://issues.apache.org/jira/browse/AMQ-5073
Date Tue, 11 Mar 2014 13:58:23 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk a3a41dae3 -> c8a5fb769


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


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c8a5fb76
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c8a5fb76
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c8a5fb76

Branch: refs/heads/trunk
Commit: c8a5fb769e9acc68f7a83c9d8b37682a4225de25
Parents: a3a41da
Author: Kevin Earls <kevin@kevinearls.com>
Authored: Tue Mar 11 14:58:13 2014 +0100
Committer: Kevin Earls <kevin@kevinearls.com>
Committed: Tue Mar 11 14:58:13 2014 +0100

----------------------------------------------------------------------
 .../apache/activemq/transport/amqp/AmqpNioTransportHelper.java    | 3 ++-
 .../org/apache/activemq/transport/amqp/joram/JoramJmsNioTest.java | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/c8a5fb76/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpNioTransportHelper.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpNioTransportHelper.java
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpNioTransportHelper.java
index 09cab5d..076fff4 100644
--- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpNioTransportHelper.java
+++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpNioTransportHelper.java
@@ -158,6 +158,7 @@ public class AmqpNioTransportHelper {
         } else {
             transportSupport.doConsume(AmqpSupport.toBuffer(currentBuffer));
         }
+        currentBuffer = null;
 
         if (plain.hasRemaining()) {
             if (plain.remaining() < 4) {
@@ -167,8 +168,8 @@ public class AmqpNioTransportHelper {
             }
         } else {
             nextFrameSize = -1;
-            currentBuffer = null;
         }
+
         return nextFrameSize;
     }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/c8a5fb76/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioTest.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioTest.java
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioTest.java
index 7c78d0f..b50bbff 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioTest.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioTest.java
@@ -42,7 +42,6 @@ import org.objectweb.jtests.jms.conform.topic.TemporaryTopicTest;
 /**
  * Run the JoramJmsTests using amqp+nio
  */
-@Ignore("AMQ-5094")
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
     // TopicSessionTest.class,    // Hangs, see https://issues.apache.org/jira/browse/PROTON-154


Mime
View raw message