This is an automated email from the ASF dual-hosted git repository.
michaelpearce pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit ba53bed20d22b01ccee16abb6adba8100ad36afa
Merge: 6e0dc81 bfefd1f
Author: Michael Andre Pearce <michael.andre.pea...@me.com>
AuthorDate: Thu Jan 17 22:41:56 2019 +0000
This closes #2470
.../cli/commands/messages/ConsumerThread.java | 2 +-
.../artemis/cli/commands/tools/PrintData.java | 94 +++++++++++-----------
.../cli/commands/tools/journal/DecodeJournal.java | 10 ++-
.../cli/commands/tools/xml/XMLMessageImporter.java | 8 +-
.../cli/commands/tools/xml/XmlDataImporter.java | 12 ++-
.../artemis/core/server/NetworkHealthCheck.java | 18 +++--
.../activemq/artemis/utils/FactoryFinder.java | 9 +--
.../utils/collections/ConcurrentLongHashMap.java | 6 +-
.../core/client/impl/ClientProducerImpl.java | 2 +-
.../core/impl/ActiveMQClientProtocolManager.java | 4 +-
.../core/protocol/core/impl/ChannelImpl.java | 2 +-
.../core/remoting/impl/netty/NettyConnector.java | 6 +-
.../jdbc/store/drivers/AbstractJDBCDriver.java | 2 +-
.../artemis/jms/client/ActiveMQMessage.java | 4 +-
.../core/io/aio/AIOSequentialFileFactory.java | 4 +-
.../protocol/amqp/converter/CoreAmqpConverter.java | 8 +-
.../core/protocol/openwire/OpenWireConnection.java | 8 +-
.../openwire/OpenWireMessageConverter.java | 2 +-
.../artemis/ra/ActiveMQRAManagedConnection.java | 9 +--
.../artemis/ra/ConnectionFactoryProperties.java | 7 +-
.../artemis/ra/inflow/ActiveMQActivationSpec.java | 2 +-
.../artemis/rest/MessageServiceManager.java | 9 ++-
.../artemis/rest/topic/SubscriptionsResource.java | 2 +-
.../activemq/artemis/rest/util/TimeoutTask.java | 2 +-
.../artemis/core/config/FileDeploymentManager.java | 29 +++----
.../core/config/impl/ConfigurationImpl.java | 3 -
.../deployers/impl/FileConfigurationParser.java | 11 ---
.../core/management/impl/QueueControlImpl.java | 2 +-
.../persistence/impl/journal/DescribeJournal.java | 12 ++-
.../core/postoffice/impl/PostOfficeImpl.java | 2 +-
.../core/server/cluster/ha/ColocatedHAManager.java | 4 +-
.../cluster/impl/ClusterConnectionBridge.java | 18 ++---
.../server/cluster/impl/ClusterConnectionImpl.java | 3 +-
.../core/server/impl/LiveOnlyActivation.java | 6 +-
.../artemis/core/server/impl/QueueImpl.java | 5 +-
.../core/server/impl/ServerConsumerImpl.java | 2 +-
.../server/impl/SharedNothingBackupActivation.java | 2 +-
.../plugin/ActiveMQServerConsumerPlugin.java | 2 +-
.../core/transaction/impl/TransactionImpl.java | 4 +-
.../spi/core/security/jaas/LDAPLoginModule.java | 2 +-
40 files changed, 172 insertions(+), 167 deletions(-)
