You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2017/03/22 11:39:29 UTC
[1/2] activemq-artemis git commit: This closes #1117
Repository: activemq-artemis
Updated Branches:
refs/heads/master 93342905a -> af5ee3b23
This closes #1117
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/af5ee3b2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/af5ee3b2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/af5ee3b2
Branch: refs/heads/master
Commit: af5ee3b23118e48aae168536b33dceaec7a44171
Parents: 9334290 ed3de61
Author: Martyn Taylor <mt...@redhat.com>
Authored: Wed Mar 22 11:39:11 2017 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Wed Mar 22 11:39:11 2017 +0000
----------------------------------------------------------------------
.../amqp/broker/ActiveMQProtonRemotingConnection.java | 6 +++++-
.../artemis/core/protocol/openwire/OpenWireConnection.java | 9 +++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-1055 Broker generates
warning when a client tries to connect it
Posted by ma...@apache.org.
ARTEMIS-1055 Broker generates warning when a client tries to connect it
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ed3de615
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ed3de615
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ed3de615
Branch: refs/heads/master
Commit: ed3de615875506260147787243f2e31310d02542
Parents: 9334290
Author: Francesco Nigro <ni...@gmail.com>
Authored: Tue Mar 21 23:07:57 2017 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Wed Mar 22 11:39:11 2017 +0000
----------------------------------------------------------------------
.../amqp/broker/ActiveMQProtonRemotingConnection.java | 6 +++++-
.../artemis/core/protocol/openwire/OpenWireConnection.java | 9 +++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ed3de615/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ActiveMQProtonRemotingConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ActiveMQProtonRemotingConnection.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ActiveMQProtonRemotingConnection.java
index 039da79..4a1fe80 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ActiveMQProtonRemotingConnection.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ActiveMQProtonRemotingConnection.java
@@ -20,6 +20,7 @@ import java.util.concurrent.Executor;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQRemoteDisconnectException;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
import org.apache.activemq.artemis.protocol.amqp.proton.AMQPConnectionContext;
@@ -67,7 +68,10 @@ public class ActiveMQProtonRemotingConnection extends AbstractRemotingConnection
destroyed = true;
- ActiveMQClientLogger.LOGGER.connectionFailureDetected(me.getMessage(), me.getType());
+ //filter it like the other protocols
+ if (!(me instanceof ActiveMQRemoteDisconnectException)) {
+ ActiveMQClientLogger.LOGGER.connectionFailureDetected(me.getMessage(), me.getType());
+ }
// Then call the listeners
callFailureListeners(me, scaleDownTargetNodeID);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ed3de615/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index 6b1b579..60a8dca 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -38,8 +38,11 @@ import org.apache.activemq.advisory.AdvisorySupport;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException;
+import org.apache.activemq.artemis.api.core.ActiveMQRemoteDisconnectException;
import org.apache.activemq.artemis.api.core.ActiveMQSecurityException;
+import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
import org.apache.activemq.artemis.core.io.IOCallback;
import org.apache.activemq.artemis.core.persistence.OperationContext;
import org.apache.activemq.artemis.core.postoffice.Binding;
@@ -62,7 +65,6 @@ import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
import org.apache.activemq.artemis.core.server.BindingQueryResult;
import org.apache.activemq.artemis.core.server.MessageReference;
import org.apache.activemq.artemis.core.server.Queue;
-import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.core.server.ServerConsumer;
import org.apache.activemq.artemis.core.server.ServerSession;
import org.apache.activemq.artemis.core.server.SlowConsumerDetectionListener;
@@ -603,7 +605,10 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
public void fail(ActiveMQException me, String message) {
if (me != null) {
- ActiveMQServerLogger.LOGGER.connectionFailureDetected(me.getMessage(), me.getType());
+ //filter it like the other protocols
+ if (!(me instanceof ActiveMQRemoteDisconnectException)) {
+ ActiveMQClientLogger.LOGGER.connectionFailureDetected(me.getMessage(), me.getType());
+ }
}
try {
protocolManager.removeConnection(this.getConnectionInfo(), me);