You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2017/09/12 18:14:49 UTC
[1/2] activemq-artemis git commit: This closes #1528
Repository: activemq-artemis
Updated Branches:
refs/heads/master 07a218572 -> f150c0918
This closes #1528
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f150c091
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f150c091
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f150c091
Branch: refs/heads/master
Commit: f150c0918e4e35e9477401bb520b13a4756a2eb1
Parents: 07a2185 412b63a
Author: Justin Bertram <jb...@apache.org>
Authored: Tue Sep 12 13:14:39 2017 -0500
Committer: Justin Bertram <jb...@apache.org>
Committed: Tue Sep 12 13:14:39 2017 -0500
----------------------------------------------------------------------
.../artemis/protocol/amqp/broker/AMQPConnectionCallback.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-1407 Remove unused method
that performs invalid operation
Posted by jb...@apache.org.
ARTEMIS-1407 Remove unused method that performs invalid operation
Remove the unused transaction remove method as the getTransaction method
provides the remove operation and the remove method was doing an invalud
remove of wrong type from the transactions collection.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/412b63a6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/412b63a6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/412b63a6
Branch: refs/heads/master
Commit: 412b63a6b5c5be097379f09c249f9c3bfb89e4ea
Parents: 07a2185
Author: Timothy Bish <ta...@gmail.com>
Authored: Mon Sep 11 15:01:18 2017 -0400
Committer: Justin Bertram <jb...@apache.org>
Committed: Tue Sep 12 13:14:39 2017 -0500
----------------------------------------------------------------------
.../artemis/protocol/amqp/broker/AMQPConnectionCallback.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/412b63a6/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java
index 0f91b7f..17cae8e 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java
@@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
-import io.netty.buffer.ByteBuf;
import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper;
@@ -55,6 +54,8 @@ import org.apache.qpid.proton.amqp.Symbol;
import org.apache.qpid.proton.amqp.transport.AmqpError;
import org.jboss.logging.Logger;
+import io.netty.buffer.ByteBuf;
+
public class AMQPConnectionCallback implements FailureListener, CloseListener {
private static final Logger logger = Logger.getLogger(AMQPConnectionCallback.class);
@@ -261,11 +262,6 @@ public class AMQPConnectionCallback implements FailureListener, CloseListener {
return tx;
}
- public Transaction removeTransaction(Binary txid) {
- XidImpl xid = newXID(txid.getArray());
- return transactions.remove(xid);
- }
-
protected XidImpl newXID() {
return newXID(UUIDGenerator.getInstance().generateStringUUID().getBytes());
}