You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/07/29 19:28:02 UTC
[1/2] activemq-artemis git commit: Fix connection list cleanup in
OpenWireProtocolManager.removeConnection
Repository: activemq-artemis
Updated Branches:
refs/heads/master 146786ad8 -> 6cc01830d
Fix connection list cleanup in OpenWireProtocolManager.removeConnection
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/616c038d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/616c038d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/616c038d
Branch: refs/heads/master
Commit: 616c038daefb2350806bc3652e20e84b47b333c4
Parents: 146786a
Author: Ville Skytt� <vi...@iki.fi>
Authored: Fri Jul 29 19:23:09 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Jul 29 15:27:55 2016 -0400
----------------------------------------------------------------------
.../artemis/core/protocol/openwire/OpenWireProtocolManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/616c038d/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
index d20b661..50b047a 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
@@ -155,7 +155,7 @@ public class OpenWireProtocolManager implements ProtocolManager<Interceptor>, Cl
if (context != null && context.decRefCount() == 0) {
//connection is still there and need to close
context.getConnection().disconnect(error != null);
- this.connections.remove(this);//what's that for?
+ this.connections.remove(context.getConnection());
this.clientIdSet.remove(clientId);
}
}
[2/2] activemq-artemis git commit: This closes #688
Posted by cl...@apache.org.
This closes #688
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6cc01830
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6cc01830
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6cc01830
Branch: refs/heads/master
Commit: 6cc01830d1d23d74dd1a797e670057fe10560df0
Parents: 146786a 616c038
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Jul 29 15:27:56 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Jul 29 15:27:56 2016 -0400
----------------------------------------------------------------------
.../artemis/core/protocol/openwire/OpenWireProtocolManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------