Commit Graph

538 Commits

Author SHA1 Message Date
gtully b84785d5d0 https://issues.apache.org/jira/browse/AMQ-6016 - rework fix for https://issues.apache.org/jira/browse/AMQ-2106 - account group assignment on a per destination basis to prevent modification during consumer ordering
(cherry picked from commit 5d697cff3b)
2015-12-16 14:41:14 +00:00
Christopher L. Shannon (cshannon) 4ceda81e07 Revert "[maven-release-plugin] prepare release activemq-5.12.2"
This reverts commit 9d789cd28e.
2015-12-15 18:16:44 +00:00
Christopher L. Shannon (cshannon) ab43a15c99 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 21aa3ff35b.
2015-12-15 18:16:05 +00:00
Christopher L. Shannon (cshannon) 21aa3ff35b [maven-release-plugin] prepare for next development iteration 2015-12-15 16:19:29 +00:00
Christopher L. Shannon (cshannon) 9d789cd28e [maven-release-plugin] prepare release activemq-5.12.2 2015-12-15 16:18:53 +00:00
gtully d5f6b0297e https://issues.apache.org/jira/browse/AMQ-6070 - set correct originalDestination property value in advisories
(cherry picked from commit 75ff17af41)
2015-12-03 09:00:39 -05:00
Christopher L. Shannon (cshannon) 58359a85d8 https://issues.apache.org/jira/browse/AMQ-6062
Updated QueueBrowserSubscription to use a ConcurrentMap to avoid a
potential race condition when multiple queue browsers browse
multiple queues.

(cherry picked from commit d346a765e3)
2015-12-02 15:55:37 +00:00
Christopher L. Shannon (cshannon) bbb002afda https://issues.apache.org/jira/browse/AMQ-6069
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 8363c99b51)
2015-12-02 13:43:03 +00:00
Christopher L. Shannon 9617700725 https://issues.apache.org/jira/browse/AMQ-6066
Improving performance of OrderedPendingList contains method

Thanks for David Sitsky for the patch

(cherry picked from commit 673c2928a1)
2015-11-30 19:20:35 +00:00
Christopher L. Shannon (cshannon) a38c3d4b6b https://issues.apache.org/jira/browse/AMQ-5898
Removing assertion in VirtualDestinationInterceptor to allow
multiple composite destinations to forward to a physical destination

(cherry picked from commit 35b7ac250b)
2015-11-25 13:46:52 +00:00
gtully e54c9ccfa0 https://issues.apache.org/jira/browse/AMQ-6014 - fix up reference counting for durable subs such that ack on one sub does not decrement usage for offline subs. Fix and test
(cherry picked from commit 1ad0117932)
2015-11-13 18:41:21 +00:00
Timothy Bish 7875e978cd https://issues.apache.org/jira/browse/AMQ-6000
Fix and test, wakeup queue dispatch when resume is called.
(cherry picked from commit 078a101cf7)
2015-11-13 11:34:25 -05:00
Timothy Bish 42065035b6 AMQ-6032 Repack message prior to scheduler dispatch to store updated
properties in marshaled form.
(cherry picked from commit 014d5594d6)
2015-10-30 14:48:06 -04:00
Christopher L. Shannon (cshannon) 88d157faf5 [maven-release-plugin] prepare for next development iteration 2015-10-12 17:21:40 +00:00
Christopher L. Shannon (cshannon) 21c8b4695f [maven-release-plugin] prepare release activemq-5.12.1 2015-10-12 17:20:52 +00:00
Timothy Bish 82a2c0553a https://issues.apache.org/jira/browse/AMQ-5996
When possible check for noLocl changes on durable subscription
reactivation and recreate the durable sub if it changes.  For both
selector change and noLocal change also update the AbstractSubscription
selectorExpression so it matches with what was requested.
(cherry picked from commit 81b4b9ae3d)
2015-10-01 19:25:46 -04:00
Dejan Bosanac 70a49b0fa2 https://issues.apache.org/jira/browse/AMQ-5972 - wildcard policy entries not applied in correct order
(cherry picked from commit ee4672baaf)
2015-09-17 12:03:00 +00:00
Christopher L. Shannon (cshannon) 4481096428 https://issues.apache.org/jira/browse/AMQ-5967
Updating temporary limit disk check to take into account space being
used by the temporary store itself

(cherry picked from commit 4f8d56aaf6)
2015-09-14 19:49:49 +00:00
Timothy Bish f5b83cbc8f https://issues.apache.org/jira/browse/AMQ-5959
Add check to avoid NPE
(cherry picked from commit f58683ea07)
2015-09-08 10:07:24 -04:00
Timothy Bish 4e32f1e2db AMQ-5949 Treat maxSendRetries of -1 as infinite.
(cherry picked from commit 505916b927)
2015-09-02 16:37:55 -04:00
gtully e546d29997 AMQ-5933 - add test and fix
(cherry picked from commit 3c2ed9352b)
2015-08-19 11:23:21 -04:00
gtully 4c343ebd12 AMQ-5920 - make using a vt transaction configurable, a transaction negates concurrentstoreanddispatch and imposes local 2pc on mKahadb so needs to be off by default
(cherry picked from commit ffdaeb2bd1)
2015-08-17 17:06:35 -04:00
Timothy Bish 497d5b4f79 Update version for next patch release iteration. 2015-08-10 17:04:32 -04:00
Timothy Bish 6cdd750ddc [maven-release-plugin] prepare for next development iteration 2015-08-10 11:04:26 -04:00
Timothy Bish a9eeb03520 [maven-release-plugin] prepare release activemq-5.12.0 2015-08-10 11:04:17 -04:00
Christopher L. Shannon c6542a921b AMQ-5748 - Cleanup and clearing cache on shutdown 2015-08-09 09:39:14 -04:00
Christopher L. Shannon (cshannon) a49d46e3ca https://issues.apache.org/jira/browse/AMQ-5748
Updating MemoryTopicMessageStore to decrement store statistics on cache
eviction.  Updating KahaDBMessageStoreSizeStatTest to account for the
fact that a LRU cache is used so the last 100 messages are kept in
memroy.
2015-08-08 17:59:19 +00:00
Timothy Bish a3c8bee1f0 https://issues.apache.org/jira/browse/AMQ-5605
Attempt to resolve high CPU usage after error by ensuring that the
transport is disposed along with the fire of the local error.
2015-08-07 16:21:52 -04:00
Christopher L. Shannon (cshannon) 2b7bb6f81b https://issues.apache.org/jira/browse/AMQ-5837
Switching to a List to track dispatched messages in a TopicSubscription
to be consistent with a PrefetchSubscription and to prevent an error
in case acks come back out of order.
2015-08-06 17:14:09 +00:00
gtully 340728f2d1 AMQ-5920 - use implicit broker transaction for virtual topic fanout and add concurrentSend=true option to use an executor to fanout. Combination gives a 3x reduction in fanout roundtrip for small persistent messages to 100 consumer queues 2015-08-06 11:56:47 +01:00
Christopher L. Shannon (cshannon) 457dbd8b64 https://issues.apache.org/jira/browse/AMQ-5919
Converting printStackTrace statements to slf4j so that exceptions
are logged properly
2015-08-05 16:29:29 +00:00
Timothy Bish 82e3ce805e https://issues.apache.org/jira/browse/AMQ-5916
Apply patch from Ganesh Murthy to resolve issue of creation of durable
subscriber fails via broker AdminView due to lack of SecurityContext on
ConnectionContext
2015-08-04 14:51:15 -04:00
Timothy Bish 5e05df1cb7 Fix a bunch of javadoc warnings produced during release profile builds. 2015-08-04 11:54:46 -04:00
Christopher L. Shannon (cshannon) 5684d093c0 https://issues.apache.org/jira/browse/AMQ-5875
Reworking DurableConduitBridge to look up subscriptions from the
TopicRegion  instead of the RegionBroker since inactive subscriptions
need to be looked at as well when dynamicOnly is false for a
network bridge.
2015-07-29 12:10:05 +01:00
gtully a439a0c6bf AMQ-5875 - rework the patch a bit to only call createDemandSubscription when we have a match to avoid trcking state in error via the bridge subscriptionMap* from configureDemandSubscription 2015-07-17 16:56:22 +01:00
Christopher L. Shannon (cshannon) 2117768e0a https://issues.apache.org/jira/browse/AMQ-5875
Fixing a regression that caused a network bridge to recreate durable
demand improperly.
2015-07-17 16:34:06 +01:00
gtully b1ea29ed14 AMQ-5892 - remove default stack trace from service warn to debug level on async error; makes it consistent with transport logging 2015-07-16 15:18:23 +01:00
gtully 2b5b890db9 AMQ-5888 add patch from GMURTHY with thanks - fix and test 2015-07-16 11:53:12 +01:00
Christopher L. Shannon (cshannon) f10aab6428 https://issues.apache.org/jira/browse/AMQ-5851
resolves #123

This commit resolves an issue where unmatched acknowledgement
messages could be received when running a MDB consumer and
sending messages with a short TTL.  The expiration logic when
receiveing an expired Message Ack will now only expire messages
in dispatch relating to the received ack, not all expired messages
in the dispatch list.
2015-07-09 16:46:21 +01:00
gtully a05a9a2129 https://issues.apache.org/jira/browse/AMQ-5552 - added profile for activemq.tests=smoke to run a fast subset of tests that gives a fast verification of a full build 2015-07-09 14:10:38 +01:00
Timothy Bish 13044decce https://issues.apache.org/jira/browse/AMQ-5848
Use the latest openwire version marshallers in the KahaDB store when
starting from a clean install, drop back to the version used in the
existing store if one is found.
2015-07-08 17:29:32 -04:00
Christopher L. Shannon bd28c3b0ba https://issues.apache.org/jira/browse/AMQ-5748
Fixing a potential Null pointer exception in  MemoryMessageStore
2015-07-07 18:54:06 -04:00
Christopher L. Shannon (cshannon) 46055034c9 https://issues.apache.org/jira/browse/AMQ-5837
This commit adds an Inflight message size statistic to SubscriptionStatistics
so we can know the size of all the messages that are inflight, besides just the count.
2015-07-07 16:33:58 -04:00
Christopher L. Shannon (cshannon) 785b16bf9e https://issues.apache.org/jira/browse/AMQ-5748
Added a getMessageSize method to MessageStore to support retrieving the
total message size of all stored messages for a destination.  Added a
new storeMessageSize statistic to DestinationStatistics.
2015-07-07 18:03:27 +00:00
Timothy Bish 7a68ad5d98 https://issues.apache.org/jira/browse/AMQ-4814
Remove of a durable subscription when the keepDurableSubActive flag is
true (default) did not actually stop and cleanup the still active cursor
due to the fact that the cursor checks the flag of its subscription to
see if it should stay active when its stop method is called.  The
subscription needs to disable that flag when the subscription is being
removed so that the cursor will correctly shutdown.
2015-07-06 18:21:20 -04:00
Timothy Bish c38a61d7ae https://issues.apache.org/jira/browse/AMQ-5340
Clean up a bit, extend test timeout to account for slow CI machines,
remove System prints and replace with LOG.
2015-07-06 16:47:58 -04:00
Christopher L. Shannon 174dcbff2a https://issues.apache.org/jira/browse/AMQ-5340
A QueueBrowser no longer checks expiry on messages to prevent a
browser from hanging in between the hasMoreElements check and actually
getting a message.  This means that if messages were in the queue when
the browser started it will receive messages even if they are now
expired. Even though the browser will get the expired message, the
broker will still expire it to prevent future access to it.

Thanks to Henno Vermeulen for providing a test case.
2015-07-06 16:13:52 -04:00
Timothy Bish e4af2eb635 https://issues.apache.org/jira/browse/AMQ-5814
Use the context of the subscription when the producer adds a destination
that matches its wildcard.
2015-07-02 11:36:53 -04:00
Christopher L. Shannon (cshannon) 12b26b641b https://issues.apache.org/jira/browse/AMQ-5745
This commit is based off a patch submitted by admin@int3solutions.com.
It fixes several locations in the code where there are potential resource leaks.
2015-06-30 13:41:48 -04:00
Timothy Bish 1b493749a1 https://issues.apache.org/jira/browse/AMQ-5859
fix for incorrect logic in reconnect attempt limits and also fix a case
where an NPE could occur (saw in the tests).   Based on patch provided
by Benoit Wiart
2015-06-30 13:00:04 -04:00