Repository: activemq-artemis
Updated Branches:
refs/heads/1.x 3e9ee356f -> b1538e7c4
Revert "[ARTEMIS-1770] Log warning when connection is closed"
This reverts commit 20aed7f864ad1f2a549a155f2b8e689b8850e7c4.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b1538e7c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b1538e7c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b1538e7c
Branch: refs/heads/1.x
Commit: b1538e7c48342fc87935789127e82d71962f707e
Parents: 3e9ee35
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Wed May 2 11:30:20 2018 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Wed May 2 11:30:20 2018 -0400
----------------------------------------------------------------------
.../artemis/core/client/ActiveMQClientLogger.java | 5 -----
.../artemis/core/client/impl/ClientSessionImpl.java | 11 -----------
2 files changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b1538e7c/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 fbc6959..88c817f 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
@@ -442,9 +442,4 @@ public interface ActiveMQClientLogger extends BasicLogger {
@Message(id = 214029, value = "Unexpected response from HTTP server: %s")
void unexpectedResponseFromHttpServer(Object response);
- @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/b1538e7c/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 4596616..d5a867d 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
@@ -31,7 +31,6 @@ 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.SimpleString;
import org.apache.activemq.artemis.api.core.client.ClientConsumer;
@@ -1172,11 +1171,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();
}
@@ -1381,11 +1375,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();
|