The chooseValue method in DestinationMap will now always return the
exact match, if there is one, else it will then sort as before.
(cherry picked from commit 8e2176d93c95d847c813f54d54aaf9bafba4d5c4)
Fixing JournalCorruptionEofIndexRecoveryTest class
Because of the size being stored in the message order index, the test
testRecoveryAftercorruptionCheckSumExistingIndex was no longer passing
as that test was corrupting the size value in the journal, but not the
size value in the index. The test now corrupts both values so that the
expect exception occurs again.
(cherry picked from commit 507d40a79f15449ba6d79ef85d7fdf6bf50a3a65)
Fixing KahaDB so that the correct marshaller is used for the message
keys inside of the message order index. This will ensure that message
size metrics are accurate.
(cherry picked from commit 246ccb8e04515c6e85544b32035537f60d92b5b9)
Call to the statistics instance of the subscription to reset the
counters.
(cherry picked from commit 564d55023ec7386c31277db054ecc63d966e2b29)
Conflicts:
activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
Making new values in ActiveMQObjectMessage transient which fixes HTTP
serialization
(cherry picked from commit b9dcb010f74675f6369f7e74b931b670e0ecab51)
Make the transportConnector configs consistent across all four variants
by removing the enableCipherSuites option on openwire NIO+SSL. RC4 was
enabled on the broker side but in later JDK releases that suite is
disbaled as it is insecure so the client side couldn't find a supported
suite.
(cherry picked from commit 315147c5ef3d545a868c74fe55d8ea7efb09f1d1)
Updated QueueBrowserSubscription to use a ConcurrentMap to avoid a
potential race condition when multiple queue browsers browse
multiple queues.
(cherry picked from commit d346a765e3064a951c5d55119b80b8432a45bcb6)
Fixed contains method in PrioritizedPendinList which was not returning
correctly. This was causing messages to not be removed from the
dispatchPendingList when purge was called inside a Queue leading to an
eventual OOM error if enough messages were purged. This fix also
improves performance of the contains method.
(cherry picked from commit 8363c99b51a98eb176e6baea82fcafce3225ba2c)
Improving performance of OrderedPendingList contains method
Thanks for David Sitsky for the patch
(cherry picked from commit 673c2928a1b567958c2d9eabe2995a039f2aa1e2)
Removing assertion in VirtualDestinationInterceptor to allow
multiple composite destinations to forward to a physical destination
(cherry picked from commit 35b7ac250b5fa0b8c8dbf728881cc9dbf6edce19)
Account for Authzid in SASL PLAIN mechanism and provide a means to fail
the authorization if the challenge response is invalid. Update the
client to properly exclude sasl mechanism that don't apply to it's
configured credentials such as using only ANONYMOUS when no user or
password is set.
(cherry picked from commit b5dd0a16f4197cfab086b3139892a73b27c8ac74)
Add support for amqp style variants of the ActiveMQ job scheduler
options set in message annotations.
(cherry picked from commit 5d353e241b0ba76ad1a0b42ef5c7a2ae54106860)
Add support for the delivery time header to allow for scheduled messages
at a desired time.
(cherry picked from commit 480b3e7c36b157d12dfdc1318f5517c4050df312)
