9184 Commits

Author SHA1 Message Date
Timothy Bish
85da157238 https://issues.apache.org/jira/browse/AMQ-6350
Allow for PooledConnectionFactory restart after being stopped.
(cherry picked from commit 0706fd0bc1f499f1fc304ec1c70aa8aaa3dd4d69)
2016-07-11 18:21:43 -04:00
Timothy Bish
21cd612098 https://issues.apache.org/jira/browse/AMQ-5886
Ensure we reject protocol version that we don't currently support.
(cherry picked from commit f3544f248ffdce8d4c4bb80698b0d69a7e7492d9)
2016-07-11 12:18:56 -04:00
Christopher L. Shannon (cshannon)
7342b3760f https://issues.apache.org/jira/browse/AMQ-6345
disabling failed assertion for test as it is expected based on how this
test is usin the client

(cherry picked from commit 667ea7c640dd0203b2ecdc83f74435e77cbe44ab)
2016-07-07 18:26:37 +00:00
Christopher L. Shannon (cshannon)
bad922c9ef https://issues.apache.org/jira/browse/AMQ-6345
Moving PINGREQ tests into its own test class so they aren't run more
than once

(cherry picked from commit b5b087d5585b734d15873303b1f35c572cafbe68)
2016-07-07 13:55:12 +00:00
Christopher L. Shannon (cshannon)
04464e48ab https://issues.apache.org/jira/browse/AMQ-6345
The MQTT transport will now throw an exception if a PINGREQ is sent to
the broker if a CONNECT packet has not been received first as the spec
says CONNECT must be the first packet sent.

(cherry picked from commit 6dacef1c9552edbad656c31d784179c2cd179b2e)
2016-07-06 16:01:53 +00:00
Christopher L. Shannon (cshannon)
8812cb9b8e https://issues.apache.org/jira/browse/AMQ-5426
Fixing a race condition in ActiveMQMessageConsumer that could cause a
NPE when the consumer is closing by only modifing pendingAck inside of
the deliveredMessagesMutex

Thanks to Michael Wong for providing the test case for this issue.

(cherry picked from commit c02bc648460059b6dbc201fa21b7ee0ce2445082)
2016-07-05 20:38:59 +00:00
Christopher L. Shannon (cshannon)
72c3a6d0b4 Revert "https://issues.apache.org/jira/browse/AMQ-5426"
This reverts commit 2ec32b67af3f494d65a076b32f71560168bb6ec9.
2016-07-05 20:38:53 +00:00
Christopher L. Shannon (cshannon)
2ec32b67af https://issues.apache.org/jira/browse/AMQ-5426
Fixing a race condition in ActiveMQMessageConsumer that could cause a
NPE when the consumer is closing

Thanks to Michael Wong for providing the test case for this issue.

(cherry picked from commit 6bfa13b6e707fb3465a9193cd44c478514fcd948)
2016-07-05 20:08:07 +00:00
Timothy Bish
53c9d7ecb6 https://issues.apache.org/jira/browse/AMQ-6305
Lower prefetch on settlement of allow for dispatch of the full amount of
granted credit.  Adds additional tests.
(cherry picked from commit db71b43b19e24019fe7ef08dd80d53998b9eec9b)
2016-07-05 19:55:09 +00:00
Timothy Bish
8916beea42 https://issues.apache.org/jira/browse/AMQ-6305
Refactor credit handling and drain state tracking to ensure we stay in
sync with the remote state and always answer drain requests.  Start
adding some more tests around drain to the interop suite.
(cherry picked from commit 8448cf1cb886b242b54235b091259acbf43c2108)
2016-07-05 19:55:02 +00:00
Timothy Bish
508c12d948 https://issues.apache.org/jira/browse/AMQ-6305
Add test and supporting enhancements to the JUnit module to allow for
easy repetition of tests that don't always fail reliably
(cherry picked from commit 6ae169e2755257b1e8e5068473bdb3156160790d)
2016-07-05 19:54:54 +00:00
Christopher L. Shannon (cshannon)
fda982dccb https://issues.apache.org/jira/browse/AMQ-6343
On MQTT Websocket close, a LWT message will be properly sent if
configured and a disconnect packet was not received

(cherry picked from commit bd442a3388b0f127c8f8b9fad5e4888b77bb42c3)
2016-07-05 18:19:24 +00:00
Christopher L. Shannon (cshannon)
1dfd0eeb60 https://issues.apache.org/jira/browse/AMQ-6346
Prevent concurrent access to the MQTT protocol handlers which can lead
to a tansport level deadlock

(cherry picked from commit 96494f74c7142c3396f17696f345c2355c16a61c)
2016-07-05 18:18:14 +00:00
Christopher L. Shannon (cshannon)
7ddfa97d01 https://issues.apache.org/jira/browse/AMQ-6194
Fixing an issue that caused statistics for a transactional temporary
queue to be updated twice by mistake.  Moved the statistics update into
tryOrderedCursorAdd so that the update is called immediately only if
not inside a transaction.

(cherry picked from commit 903dec615c7932475bd3e6cd869af25f01de64b2)
2016-07-01 10:38:02 +00:00
Timothy Bish
6fda5e3262 https://issues.apache.org/jira/browse/AMQ-6340
combine the lists in the correct order for later redispatch.
(cherry picked from commit 4e23adfcc981d3e13e7f1b1182b89a954160a26a)
2016-06-29 13:27:37 -04:00
Timothy Bish
8ae7c8f3a7 https://issues.apache.org/jira/browse/AMQ-6286
Create a follow on test showing AMQP respects order.
(cherry picked from commit e02c1a17f83b21cbf42fa9e6e78a891af3edd8bb)
2016-06-29 13:27:17 -04:00
Christopher L. Shannon (cshannon)
6271a7e353 https://issues.apache.org/jira/browse/AMQ-6337
Checking for the correct number of arguments before reflectively
invoking a method in DefaultAuthorizationMap

(cherry picked from commit 6be36305f6669ded47bcd33016583a86bdda04dd)
2016-06-23 20:36:16 +00:00
Timothy Bish
33e70292d4 https://issues.apache.org/jira/browse/AMQ-6334
Fix error handling for connection establishment on the bridge.
(cherry picked from commit 03785a4d53877bb4088e0d83558d09147e1f0124)
2016-06-23 11:04:10 -04:00
Timothy Bish
0afe7d9d24 https://issues.apache.org/jira/browse/AMQ-6328
Update camel to 2.16.3
2016-06-17 16:59:28 -04:00
Timothy Bish
8d114f058d https://issues.apache.org/jira/browse/AMQ-6325
Fix issue with selector parser.
(cherry picked from commit 7b207567d9d304facdfa7c1c5d7fa8a81b6fe70e)
2016-06-14 12:50:02 -04:00
Timothy Bish
eb9139dddc https://issues.apache.org/jira/browse/AMQ-6319
Additional fixes and tests for disable of non-SASL client connects.
(cherry picked from commit c5998444cf3c29ea97cea28937180bf8b99dd666)
2016-06-10 17:12:16 -04:00
Timothy Bish
f471b51c2a https://issues.apache.org/jira/browse/AMQ-6319
Improve configuration for disabling non-SASL connections.
(cherry picked from commit c49db029ab280dcc1755d855f3641526ad2a5e90)
2016-06-09 17:33:27 -04:00
Timothy Bish
d594248db5 https://issues.apache.org/jira/browse/AMQ-6275
Avoid unnecessary connection state lookup leading to lock ordering
issues.
(cherry picked from commit 98d20008333af380ae05d91036d123501115ab8c)
2016-06-09 12:10:47 -04:00
Jonathan Malek
539d6b747a A fix for AMQ-6310
Checking for leading wildcard in the prefix for a virtualtopic,
modifying the behavior of shouldDispatch in the VirtualTopicInterceptor.

(cherry picked from commit 6bf5987921f6fdb6844652bb77e2fc14b002ccf2)
2016-06-06 13:17:25 +00:00
Timothy Bish
ceeb1f68ac https://issues.apache.org/jira/browse/AMQ-6304
Ensure that the broker send a container ID using its assigned Broker
name value.
(cherry picked from commit 76b70545f248e6970245719f2f584298b8d493fd)
2016-06-01 18:39:40 -04:00
Seth Leger
6d539b4f01 AMQ-6298: Moved Spring Import-Package wildcard below other Spring
imports.
2016-05-20 15:15:11 +02:00
Timothy Bish
405280ecce https://issues.apache.org/jira/browse/AMQ-6292
allow for batch writes of forwarded acks.
(cherry picked from commit 15405af2e6c44037ce09e616bdfe79852c19647a)
2016-05-13 14:57:17 -04:00
Timothy Bish
52d2b15780 https://issues.apache.org/jira/browse/AMQ-6291
Better management of shared resources between the background run thread
and the main start / stop thread.  Makes sure to cleanup all resources
before finally throwing on stop to prevent leaking and resources.  
(cherry picked from commit ff99872263981982bb1ebce93c07bfb8a28d4a06)

Conflicts:
	activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
2016-05-13 11:29:25 -04:00
Timothy Bish
3a4cdeb91a Add Jaas module needed for new tests. 2016-05-11 17:29:16 -04:00
Timothy Bish
4c45398575 https://issues.apache.org/jira/browse/AMQ-6290
Close failed connection on start if the reconnect on exception flag is
enabled.  
(cherry picked from commit 2e64abc38a0605f31fc47a89c8313f29cc72c170)

Conflicts:
	activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/PooledConnectionSecurityExceptionTest.java
2016-05-11 16:16:09 -04:00
Christopher L. Shannon (cshannon)
c8a805deff https://issues.apache.org/jira/browse/AMQ-6287
Properly enclosing the indexLock in a try/finally inside of
AckCompactionRunner
2016-05-11 12:35:30 +00:00
Christopher L. Shannon (cshannon)
0ba9f9340f https://issues.apache.org/jira/browse/AMQ-6285
Added an extra isShutdown() failsafe check when detecting if the
checkpoint thread should start

(cherry picked from commit 91213010b30d426095c16d3fa8d5fa2cafaf05e5)
2016-05-09 19:36:14 +00:00
Christopher L. Shannon (cshannon)
cd68c42b90 https://issues.apache.org/jira/browse/AMQ-6285
Properly nulling out the scheduler service in MessageDatabase after it
is shutdown on a store close so that if the store is restarted the
thread will properly restart.

(cherry picked from commit 7bdcca1bdacec4955c55e8717ac8d61cc51b0c69)
2016-05-09 19:10:24 +00:00
Christopher L. Shannon (cshannon)
6abf89f0a5 https://issues.apache.org/jira/browse/AMQ-6100
Adding missing LICENSE header

(cherry picked from commit b7db97d8e215ba16a812b5f8577f2e8d91fc7787)
2016-05-05 14:14:23 -04:00
Dejan Bosanac
c276e2e652 https://issues.apache.org/jira/browse/AMQ-6100 - Virtual topic message destination should be the target queue
(cherry picked from commit 4e63ee7cc7c4ed7d1fb8ae916c0984b974c175c0)
2016-05-05 14:14:11 -04:00
Quinn Stevenson
0e78877f64 AMQ-6274 - set originalDestination for composite destinations
This closes #184

(cherry picked from commit 1ccd17791b1cb5ba4487adb6d14a819d2d2840e2)
2016-05-05 11:44:59 -04:00
Christopher L. Shannon (cshannon)
e82e5c5e3c [maven-release-plugin] prepare for next development iteration 2016-04-28 12:28:08 +00:00
Christopher L. Shannon (cshannon)
f2f130b3c8 [maven-release-plugin] prepare release activemq-5.13.3 activemq-5.13.3 2016-04-28 12:27:29 +00:00
Timothy Bish
37b5dbf0ea Add some additional checks for valid state.
(cherry picked from commit 3c342ffce43546667f59bb16db373061724e1b0f)
2016-04-28 11:56:52 +00:00
Christopher L. Shannon (cshannon)
d38c5906f6 https://issues.apache.org/jira/browse/AMQ-6267
Added two new properties for configuration to a network bridge,
advisoryPrefetchSize and advisoryAckPercentage.  By default
advisoryPrefetchSize is set to 0, which is disabled, and will use the
prefetchSize value unless otherwise set.  Also added validation to
prefetchSize to make sure it is greater than 0 as 0 is not allowed.

(cherry picked from commit 297eadf7461fe4043c81c6f8d806a7c61b680731)
2016-04-28 11:48:53 +00:00
Christopher L. Shannon (cshannon)
4c109cf273 Revert "[maven-release-plugin] prepare release activemq-5.13.3"
This reverts commit c49ab9fb5117a1adf0d57c0d1150bbff7026aede.
2016-04-28 11:47:44 +00:00
Christopher L. Shannon (cshannon)
2e9c35bf26 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit ff2241d79598bfffb41c3d87d4cd07118bdc4eb2.
2016-04-28 11:47:32 +00:00
Timothy Bish
bb58db75a6 https://issues.apache.org/jira/browse/AMQ-6251
Make field volatile since it is written to outside of any locks and read
both in and out of locking.
(cherry picked from commit 8031d77f984e4d3c54782dd4934f48b35cf16c00)
2016-04-28 11:46:42 +00:00
gtully
e633e49aff https://issues.apache.org/jira/browse/AMQ-6175 - fix unit test regression SelectiveMBeanRegistrationTest
(cherry picked from commit e313f4098900b717614cc109a1ab028e7bb5fd67)
2016-04-27 11:40:20 +00:00
Timothy Bish
94023ebed5 https://issues.apache.org/jira/browse/AMQ-6263
Encode the incoming messageId value into a string using type prefixes
and decode them on the way out to ensure that we preserve the original
AMQP MessageId type and value.
(cherry picked from commit 4d6f4d74755d6c9985078766fce2eba95d9bbb6a)
2016-04-26 18:08:59 -04:00
Christopher L. Shannon (cshannon)
ff2241d795 [maven-release-plugin] prepare for next development iteration 2016-04-26 13:32:03 +00:00
Christopher L. Shannon (cshannon)
c49ab9fb51 [maven-release-plugin] prepare release activemq-5.13.3 2016-04-26 13:31:15 +00:00
Christopher L. Shannon (cshannon)
c5e607fcd2 NO-JIRA : Adding 5.13.3 schema identifier
(cherry picked from commit 4e27618ddd85fbaa91610cb4b815c8c686d6a351)
2016-04-26 11:18:43 +00:00
Timothy Bish
0c3d05f2ea https://issues.apache.org/jira/browse/AMQ-6262
Ensure that the connection check task is stopped once commands pass
through the inactivity monitor to prevent the transport from being
closed for no reason.
(cherry picked from commit e47edd7a282e1391f480c1278555f4a86e9a8ea9)
2016-04-25 17:05:45 -04:00
Timothy Bish
2796c0f5d7 https://issues.apache.org/jira/browse/AMQ-6126
Ensure the constructors pass along the default value as read from system
property if set.
(cherry picked from commit 3e7847aeada26bf147ca297e79995d43e74fc97d)
2016-04-21 13:15:55 -04:00