You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ga...@apache.org on 2018/04/17 03:06:11 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1792 race in STOMP
unsubscribe
Repository: activemq-artemis
Updated Branches:
refs/heads/master b3d781daa -> b268ac065
ARTEMIS-1792 race in STOMP unsubscribe
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/81d9c74d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/81d9c74d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/81d9c74d
Branch: refs/heads/master
Commit: 81d9c74d6f53a595042cbc273e630cd71d93b7e4
Parents: b3d781d
Author: Justin Bertram <jb...@apache.org>
Authored: Mon Apr 9 08:28:44 2018 -0500
Committer: Howard Gao <ho...@gmail.com>
Committed: Tue Apr 17 11:04:44 2018 +0800
----------------------------------------------------------------------
.../activemq/artemis/core/protocol/stomp/StompConnection.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/81d9c74d/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
index baaa36e..32e64b3 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
@@ -25,6 +25,7 @@ import java.util.StringTokenizer;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledExecutorService;
+import org.apache.activemq.artemis.api.core.ActiveMQAddressDoesNotExistException;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
import org.apache.activemq.artemis.api.core.ActiveMQException;
@@ -706,6 +707,8 @@ public final class StompConnection implements RemotingConnection {
public void unsubscribe(String subscriptionID, String durableSubscriptionName) throws ActiveMQStompException {
try {
manager.unsubscribe(this, subscriptionID, durableSubscriptionName);
+ } catch (ActiveMQAddressDoesNotExistException e) {
+ // this could happen if multiple clients unsubscribe simultaneously and auto-delete-addresses = true
} catch (ActiveMQStompException e) {
throw e;
} catch (Exception e) {
[2/2] activemq-artemis git commit: This closes #2001
Posted by ga...@apache.org.
This closes #2001
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b268ac06
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b268ac06
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b268ac06
Branch: refs/heads/master
Commit: b268ac06522884d2427edb545e07a190884d7c43
Parents: b3d781d 81d9c74
Author: Howard Gao <ho...@gmail.com>
Authored: Tue Apr 17 11:05:12 2018 +0800
Committer: Howard Gao <ho...@gmail.com>
Committed: Tue Apr 17 11:05:12 2018 +0800
----------------------------------------------------------------------
.../activemq/artemis/core/protocol/stomp/StompConnection.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------