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 2018/04/10 17:23:51 UTC
[2/2] activemq-artemis git commit: ARTEMIS-1798 DEBUG message bad
write method arg count - fix
ARTEMIS-1798 DEBUG message bad write method arg count - fix
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5063488b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5063488b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5063488b
Branch: refs/heads/master
Commit: 5063488b2118e854bf91acbf4d888bd5b6a0179d
Parents: 171591d
Author: Stanislav Knot <sk...@redhat.com>
Authored: Tue Apr 10 15:01:55 2018 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Apr 10 13:23:30 2018 -0400
----------------------------------------------------------------------
.../artemis/core/protocol/openwire/OpenWireConnection.java | 2 +-
.../artemis/core/protocol/openwire/OpenWireProtocolManager.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5063488b/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 f671671..69d900e 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
@@ -1295,7 +1295,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
outWireFormat.renegotiateWireFormat(command);
//throw back a brokerInfo here
protocolManager.sendBrokerInfo(OpenWireConnection.this);
- protocolManager.setUpInactivityParams(OpenWireConnection.this, command);
+ protocolManager.configureInactivityParams(OpenWireConnection.this, command);
return null;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5063488b/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 e96f509..95a400e 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
@@ -488,7 +488,7 @@ public class OpenWireProtocolManager implements ProtocolManager<Interceptor>, Cl
connection.dispatch(brokerInfo);
}
- public void setUpInactivityParams(OpenWireConnection connection, WireFormatInfo command) throws IOException {
+ public void configureInactivityParams(OpenWireConnection connection, WireFormatInfo command) throws IOException {
long inactivityDurationToUse = command.getMaxInactivityDuration() > this.maxInactivityDuration ? this.maxInactivityDuration : command.getMaxInactivityDuration();
long inactivityDurationInitialDelayToUse = command.getMaxInactivityDurationInitalDelay() > this.maxInactivityDurationInitalDelay ? this.maxInactivityDurationInitalDelay : command.getMaxInactivityDurationInitalDelay();
boolean useKeepAliveToUse = this.maxInactivityDuration == 0L ? false : this.useKeepAlive;