Commit Graph

623 Commits

Author SHA1 Message Date
Christopher L. Shannon (cshannon) 9d48997177 [maven-release-plugin] prepare release activemq-5.13.4 2016-07-14 11:09:17 -04:00
Christopher L. Shannon (cshannon) 78cacc5e17 https://issues.apache.org/jira/browse/AMQ-6357
Preventing a divide by 0 error by taking a local reference to the
prefetch size to guarantee that the value doesn't change after the > 0
check

(cherry picked from commit 42dabb7a7a)
2016-07-14 10:17:25 -04:00
Christopher L. Shannon (cshannon) 9c483fa477 https://issues.apache.org/jira/browse/AMQ-6352
Fixing PList size tracking by moving the null assignment on removal to
after the onRemoval method is called to make sure that the decrement is
done properly.

(cherry picked from commit d635a36940)
2016-07-12 10:28:36 -04: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 903dec615c)
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 4e23adfcc9)
2016-06-29 13:27:37 -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 6be36305f6)
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 03785a4d53)
2016-06-23 11:04:10 -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 98d2000833)
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 6bf5987921)
2016-06-06 13:17:25 +00: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 4e63ee7cc7)
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 1ccd17791b)
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
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 297eadf746)
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 c49ab9fb51.
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 ff2241d795.
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 8031d77f98)
2016-04-28 11:46:42 +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
Christopher L. Shannon (cshannon) 840583df09 https://issues.apache.org/jira/browse/AMQ-6256
Moving beforeMarshall back to the store implementations because we don't
want all store implementations to marshall (such as memory store)

This reverts commit 32913408a6.
2016-04-18 12:43:28 +00:00
Christopher L. Shannon (cshannon) 9d545cf11f https://issues.apache.org/jira/browse/AMQ-6222
Reverting the change to move clearMarshalledState into the callback
listener as beforeMarshall is now called before the async message add

Revert 7f5c09f2d7
2016-04-18 11:54:38 +00:00
Christopher L. Shannon (cshannon) 32913408a6 https://issues.apache.org/jira/browse/AMQ-6256
Moving beforeMarshall call out of the store and into the actual
destination

(cherry picked from commit b9b98a45ce)
2016-04-15 14:22:15 +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 19fd084a83)
2016-04-14 16:53:51 -04: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 2a8218a9a8)
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 a3a8c1c525)
2016-04-06 11:20:07 -04:00
Christopher L. Shannon (cshannon) 8393e6b8ea https://issues.apache.org/jira/browse/AMQ-6133
Disabling async queue message store when persistJMSRedelivered is turned
on for a destination.  That flag will cause a sync update later on
dispatch which can cause a race condition if the original message add is
processed after the update.  This can cause a duplicate message to be
stored.

(cherry picked from commit b2327db3b7)
2016-04-01 16:51:20 +00: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 75990ef14a)
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 a2781e3966)
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 552c0f0f7a)
2016-02-26 21:03:19 +00:00
Jeff Genender 9224f27ba3 AMQ-6175 - Web console needs to only obtain lists of MBeans that are not suppressed. 2016-02-18 14:36:06 -07:00
Timothy Bish 4782feb6a1 https://issues.apache.org/jira/browse/AMQ-6159
Ensure proper repeat counts are scheduled.
(cherry picked from commit 386210fafe)
2016-02-04 17:17:41 -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 5af5b59d3b)
2016-02-02 16:20:22 +00:00
Marc Breslow 0b481903aa Fix Impossible Cast issues in MemoryTopicSub:
- recoverSubscription()
-- map is defined as LinkedHashMap<MessageId, Message>
-- msg is defined as <map> entry.getValue() so must be a Message
-- condition if (msg.getClass() == MessageId.class) could never be true
-- no need to cast at all when using generics

- recoverNextMessages()
-- basically same code copy/pasted so same fix

Removed 2 conditions from ServerSessionPoolImpl that would result in impossible casts. Conditions removed were trying to cast ActiveMQQueueSession and ActiveMQTopicSession to ActiveMQSession which is illegal.

Since it isn't obvious what to do if you get an ActiveMQQueueSession or ActiveMQTopicSession from getServerSession() I make it fall back to the else condition which raises an async exception. This is better than getting a ClassCastException at runtime.

Remove impossible cast in MemoryMessageStore

(cherry picked from commit 4a937def7d)
2016-02-01 13:07:26 +00:00
Daniel Kulp 3e3cddc97e Remove a printStackTrace for an exception that is also logged. Produces noise on console 2016-01-27 10:21:32 -05:00
Christopher L. Shannon (cshannon) 24a9fa79f4 https://issues.apache.org/jira/browse/AMQ-6129
fixing typo

(cherry picked from commit 7b7e362465)
2016-01-15 15:13:26 +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 10c998b0bc)
2016-01-15 14:58:30 +00:00
Altaflux aa8b64420b Network of brokers on duplex mode reports InstanceAlreadyExistsException on already existing destinations
(cherry picked from commit 6b1e87410d)
2016-01-14 15:57:41 +00: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 505a76a8bb)
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 66cfc7bab3)
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 e3df09b9db)
2016-01-05 14:33:43 +00:00
Timothy Bish 871f0a6005 https://issues.apache.org/jira/browse/AMQ-6102
Call to the statistics instance of the subscription to reset the
counters.
(cherry picked from commit 564d55023e)
2015-12-21 17:04:47 -05:00
Christopher L. Shannon (cshannon) a12c21061e https://issues.apache.org/jira/browse/AMQ-6091
The JavaRuntimeConfigurationBroker can now apply a subset of policy
properties retrospectively to existing destinations versus applying
all properties of the policy update.

(cherry picked from commit a253ad3c71)
2015-12-18 18:22:19 +00:00
gtully b4360c6e0e https://issues.apache.org/jira/browse/AMQ-6086 - avoid logging npe on attempted start of persistence adapter post stop
(cherry picked from commit 455a628305)
2015-12-14 19:09:15 +00:00
gtully 2ffd7498a8 https://issues.apache.org/jira/browse/AMQ-6086 - start exception can prevent stop from exiting fully, need to be more selective in creation on stop.
(cherry picked from commit 35df815fb8)
2015-12-14 19:09:15 +00:00
gtully e5b86116c4 https://issues.apache.org/jira/browse/AMQ-6086 - add some determinism to interleaved stop and start calls on broker service
(cherry picked from commit da076f4a63)
2015-12-11 17:32:06 +00:00
gtully aa2a85abe5 https://issues.apache.org/jira/browse/AMQ-6070 - rework regression - KahaDBStoreRecoveryExpiryTest had NPE in the logs, region dest not set on recovery listener for expiry case
(cherry picked from commit 93092f7ea0)
2015-12-11 17:31:32 +00:00