activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject activemq-artemis git commit: Revert "[ARTEMIS-1770] Log warning when connection is closed"
Date Wed, 02 May 2018 15:07:17 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 9e2eb8e25 -> d5f152c72


Revert "[ARTEMIS-1770] Log warning when connection is closed"

This reverts commit 10849eb8abc01b8ae66c9ddeb350625efbc66384.
This closes #2058


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

Branch: refs/heads/master
Commit: d5f152c7254c378707b12ad4a0b798fdb8cb7b10
Parents: 9e2eb8e
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Wed May 2 11:04:50 2018 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Wed May 2 11:05:46 2018 -0400

----------------------------------------------------------------------
 .../artemis/core/client/ActiveMQClientLogger.java      |  6 ------
 .../artemis/core/client/impl/ClientSessionImpl.java    | 13 +------------
 2 files changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5f152c7/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
index 4ed2545..8d087a3 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
@@ -555,10 +555,4 @@ public interface ActiveMQClientLogger extends BasicLogger {
    @Message(id = 214033, value = "Cannot resolve host ",
            format = Message.Format.MESSAGE_FORMAT)
    void unableToResolveHost(@Cause UnknownHostException e);
-
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 214034, value = "Connection closed: {0} - {1}",
-           format = Message.Format.MESSAGE_FORMAT)
-   void connectionClosedWarn(ActiveMQExceptionType type, String message);
-
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5f152c7/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index ac21a75..ab9888e 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -33,9 +33,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
 import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
 import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
-import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
 import org.apache.activemq.artemis.api.core.Message;
-import org.apache.activemq.artemis.api.core.RoutingType;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.api.core.client.ClientConsumer;
 import org.apache.activemq.artemis.api.core.client.ClientMessage;
@@ -48,6 +46,7 @@ import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
 import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle;
 import org.apache.activemq.artemis.core.message.impl.CoreMessageObjectPools;
 import org.apache.activemq.artemis.core.remoting.FailureListener;
+import org.apache.activemq.artemis.api.core.RoutingType;
 import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 import org.apache.activemq.artemis.spi.core.remoting.ConsumerContext;
 import org.apache.activemq.artemis.spi.core.remoting.ReadyListener;
@@ -1540,11 +1539,6 @@ public final class ClientSessionImpl implements ClientSessionInternal,
FailureLi
             startCall();
             try {
                sessionContext.xaEnd(xid, flags);
-            } catch (ActiveMQNotConnectedException ex) {
-               ActiveMQClientLogger.LOGGER.connectionClosedWarn(ex.getType(), ex.getMessage());
-               if (logger.isDebugEnabled()) {
-                  logger.debug(ex.getMessage(), ex);
-               }
             } finally {
                endCall();
             }
@@ -1749,11 +1743,6 @@ public final class ClientSessionImpl implements ClientSessionInternal,
FailureLi
 
          try {
             sessionContext.xaRollback(xid, wasStarted);
-         } catch (ActiveMQNotConnectedException ex) {
-            ActiveMQClientLogger.LOGGER.connectionClosedWarn(ex.getType(), ex.getMessage());
-            if (logger.isDebugEnabled()) {
-               logger.debug(ex.getMessage(), ex);
-            }
          } finally {
             if (wasStarted) {
                start();


Mime
View raw message