767 Commits

Author SHA1 Message Date
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
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
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
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
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 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
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
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
Timothy Bish
ad07ee4612 https://issues.apache.org/jira/browse/AMQ-5153
https://issues.apache.org/jira/browse/AMQ-6254

Store the original subscribed destination along with the target
destination in the subscription info object to ensure that wildcard
subscriptions remain linked.
(cherry picked from commit b027e655538226b56f1fe277a426e0df41501fc6)
2016-04-19 09:54:46 -04:00
Christopher L. Shannon (cshannon)
dc3c5a719b https://issues.apache.org/jira/browse/AMQ-6256
Calling beforeMarshall on messages when they async stored before the
store task is run and before consumer dispatch to prevent two threads
from trying to mutate the message state at the same time.

(cherry picked from commit b9f9f03829a65efa2956c347d2cafa41905313c6)
2016-04-15 13:06:51 +00:00
Timothy Bish
cb6c7fb423 https://issues.apache.org/jira/browse/AMQ-6252
Update for some added thread safety.  Adds method healthStatus that will
regenrate the status from the healthList data which is more intuitive
than the getCurrentStatus which doesn't update state and requires
periodic calls to healthList to capture current metrics.
(cherry picked from commit 19fd084a83c990f9fb75a5f2becb48ac808a1b36)
2016-04-14 16:53:51 -04:00
Brian D. Johnson
7894d8a9a1 https://issues.apache.org/jira/browse/AMQ-6244 - reset ActiveMQBytesMessage 'compressed' flag after restoring compressed content
(cherry picked from commit 7a61718e0255728b7a822b25fcf75a030be14359)
2016-04-13 15:22:32 +00:00
Christopher L. Shannon (cshannon)
3e2bd6d2a6 NO-JIRA - Adding activemq-junit dependency to activemq-unit-tests 2016-04-13 13:22:31 +00:00
Timothy Bish
72eecbe260 https://issues.apache.org/jira/browse/AMQ-6203
Expose configuration on the persistence adapter level.
Double the test timeout and increase the compaction frequency to account
for very slow CI boxes.
(cherry picked from commit a9521dcebfb4e469dde7465ff95d8e8f1f050abd)
2016-04-12 12:34:27 +00:00
gtully
6c79298541 https://issues.apache.org/jira/browse/AMQ-6151 - retain list for redeliveries and combine for dispatch/iteration such that redeliveries retain per priority order after prefetch
(cherry picked from commit 2a8218a9a8cfa74e1049249481f601e042f33358)
2016-04-06 11:20:21 -04:00
gtully
06972183f9 https://issues.apache.org/jira/browse/AMQ-6215 - support 0 maxBrowsePageSize and maxExpirePageSize such that lazyDispatch ensures highest priority messages is available to a pull consumer
(cherry picked from commit a3a8c1c5256aa8ea1067afe3e1586832e5aa1821)
2016-04-06 11:20:07 -04:00
Christopher L. Shannon (cshannon)
7f5c09f2d7 https://issues.apache.org/jira/browse/AMQ-6222
Moving clearedMarshalledState execution to the async listener on an
async add to the message store.  This is necessary to make sure this
logic doens't execute until after the message is marshalled for the
store.

(cherry picked from commit 75990ef14a092b629bf8d2127bc4786e51b31684)
2016-03-22 18:55:57 +00:00
Christopher L. Shannon (cshannon)
442fadac87 https://issues.apache.org/jira/browse/AMQ-6204
Fixing the removal logic on virtual destination remove inside of
Advisory Broker to clean up virtual destination maps properly.  Added a
test to verify.  Also added new debug logging to help track down any
future issues.

(cherry picked from commit a2781e3966ded41a241d24ffb8d85d410c39eb21)
2016-03-09 19:57:00 +00:00
Christopher L. Shannon (cshannon)
369a430538 [maven-release-plugin] prepare for next development iteration 2016-03-01 16:39:41 +00:00
Christopher L. Shannon (cshannon)
6a2e71f11c [maven-release-plugin] prepare release activemq-5.13.2 2016-03-01 16:39:02 +00:00
Brian D. Johnson
5dfd8cdfa8 https://issues.apache.org/jira/browse/AMQ-6188 - reset BaseDestination.lastActiveTime each time a message is delivered to the broker.
(cherry picked from commit 552c0f0f7a7502c0337b13699de51a11b29723a2)
2016-02-26 21:03:19 +00:00
Timothy Bish
4782feb6a1 https://issues.apache.org/jira/browse/AMQ-6159
Ensure proper repeat counts are scheduled.
(cherry picked from commit 386210fafe331630aded29f2af64b1ccdf161bf3)
2016-02-04 17:17:41 -05:00
Christopher L. Shannon (cshannon)
23e9ecaec1 https://issues.apache.org/jira/browse/AMQ-6158
Computing messageSize for a durable subscription in KahaDB now runs much
faster (n vs n^2) which is noticable when there are a large number of
pending messages for a durable subscription.

(cherry picked from commit 25ff5699f1fb7c73668d5da2eacb53ad2ef14289)
2016-02-04 15:23:29 +00:00
Timothy Bish
04b191ceb4 https://issues.apache.org/jira/browse/AMQ-6152
Ensure that when add / remove commands are colocated they don't prevent
the log from being GC'd once it is unreferenced.
(cherry picked from commit 8c4b5f485d64caec97b0abe2b721d47bc19bfba1)
2016-02-02 20:29:57 -05:00
Christopher L. Shannon (cshannon)
86e51d2461 [maven-release-plugin] prepare for next development iteration 2016-02-02 17:11:44 +00:00
Christopher L. Shannon (cshannon)
d60b73402c [maven-release-plugin] prepare release activemq-5.13.1 2016-02-02 17:11:03 +00:00
gtully
ce604fba78 https://issues.apache.org/jira/browse/AMQ-6151 - respect prioritizeMessages for pending and redelivered messages
(cherry picked from commit 5af5b59d3bf3c84098e55b6cb87631c061990666)
2016-02-02 16:20:22 +00:00
Christopher L. Shannon (cshannon)
aaa2fdd541 https://issues.apache.org/jira/browse/AMQ-6142
Fixing a race condition that exists in the decompress method of
ActiveMQBytesMessage that can cause an invalid length to be read.

(cherry picked from commit 5f7a81f9280fb65b8a3c1f85c4570a18d87fafd9)
2016-02-01 17:37:32 +00:00
Christopher L. Shannon (cshannon)
adc3ba49c2 https://issues.apache.org/jira/browse/AMQ-6133
Fixing the processing of KahaUpdateMessageCommand to add the message to
the store if it doesn't exist, instead of ignoring it.  This will
prevent message loss in certain cases when the KahaDB index has to be
rebuilt.

(cherry picked from commit b4aa53d806570a4f054dc0af9cb095f13b914153)
2016-01-20 17:01:11 +00:00
Timothy Bish
7d3a71a4df https://issues.apache.org/jira/browse/AMQ-6131
Fix check for durable sub with no pending messages during checkpoint
cleanup.
(cherry picked from commit 193f6be6878502f3db8563465872a1afd86b7c54)
2016-01-18 17:45:05 -05:00
Christopher L. Shannon (cshannon)
6abb5b9bee https://issues.apache.org/jira/browse/AMQ-6129
Fixing DynamicallyIncludedDestinationsDuplexNetworkTest

(cherry picked from commit 1ae29382e12dd9704d78f12b7948b442005ce086)
2016-01-18 15:29:34 +00:00
Christopher L. Shannon (cshannon)
087e5da254 https://issues.apache.org/jira/browse/AMQ-6129
Adding NetworkBridgeStatistics and also a received count for bridges
when they are in duplex mode.

(cherry picked from commit 10c998b0bc9728276a738ed24d20c6fc82c6365a)
2016-01-15 14:58:30 +00:00
gtully
741ee01e11 https://issues.apache.org/jira/browse/AMQ-6124 - fix and test - propagate broker info from prestarted backup transport
(cherry picked from commit db1506a5921f70134c3b647cec51204f0e1c1416)
2016-01-14 15:57:55 +00:00
Altaflux
aa8b64420b Network of brokers on duplex mode reports InstanceAlreadyExistsException on already existing destinations
(cherry picked from commit 6b1e87410da4a2033c286fcaa758371e48da62ec)
2016-01-14 15:57:41 +00:00
Timothy Bish
b32be1bb11 https://issues.apache.org/jira/browse/AMQ-6125
Ensure that the redelivery policy is never null in the consumer.
(cherry picked from commit 92870553389ef288d81c4ad670463c4fb1002c69)
2016-01-13 18:09:54 -05:00
Timothy Bish
b04cfeb8af https://issues.apache.org/jira/browse/AMQ-6059
Ensure that a message sent to the store for the DLQ is rewritten so that
its updated values are written to prevent exirpation loops and loss of
reollback cause etc.
(cherry picked from commit 505a76a8bb7180debbd36637dce1b9101150d0b4)
2016-01-12 12:00:41 -05:00
Timothy Bish
b4405bed5e AMQ-6121
AMQ-6122

Prevent messages on DLQ for looping back onto the same DLQ.  Prevents
expired messages from bouncing back and duplicate messages from the
store from causing a deadlock.
(cherry picked from commit 66cfc7bab3dfa2e079bbc5276312c97ab02cae4f)
2016-01-12 12:00:26 -05:00
gtully
26665fa1b9 https://issues.apache.org/jira/browse/AMQ-6094 - regression via https://issues.apache.org/jira/browse/AMQ-6014 - incorrect ref count on message expiry event during cursor move for dispatch. Fix and test - thanks for the test
(cherry picked from commit e3df09b9db09d6cf2834b0beb901c253be9b6120)
2016-01-05 14:33:43 +00:00
Christopher L. Shannon (cshannon)
b103932ccd https://issues.apache.org/jira/browse/AMQ-6097
remove un-needed import statements

(cherry picked from commit 370b1810995c48129521d1c86d7b0a31d1d966d9)
2015-12-22 13:14:44 +00:00
Christopher L. Shannon (cshannon)
51aa70eaae https://issues.apache.org/jira/browse/AMQ-6097
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)
2015-12-22 13:14:44 +00:00