9560 Commits

Author SHA1 Message Date
Krzysztof Sobkowiak
659d1f6ba5 [AMQ-6586] Compilation of activemq-unit-test fails 2017-01-31 20:36:13 +01:00
Christian Schneider
776418bae6 [AMQ-6584] Remove spring-aspects as it works with just the range fix 2017-01-30 15:31:37 +01:00
Christian Schneider
cd144e803b [AMQ-6584] Fix feature to make it work for karaf 4.1.0 2017-01-30 15:31:32 +01:00
Christopher L. Shannon (cshannon)
96f312ebe5 https://issues.apache.org/jira/browse/AMQ-6579
Remove incorrect dispatch counter increment on message expiration in
TopicSubscription when a pending limit strategy is set

(cherry picked from commit d0c95146c37f96ca69e1fe82c4b2fe9208f8184e)
2017-01-25 11:18:19 -05:00
Krzysztof Sobkowiak
a579023e78 [AMQ-6576] Problem while installing activemq-camel with Camel 2.17.x or 2.18.x
(cherry picked from commit 6534a83c40e07fc5f9edb1b6a89ae58dd6908456)
2017-01-25 07:38:36 -05:00
Christopher L. Shannon (cshannon)
1811d191af https://issues.apache.org/jira/browse/AMQ-1940
Queue purge now acquires the sendLock to prevent new messages from
coming in while purging.  The statistics are no longer zeroed out as
they should properly decrement as messages are removed.  These changes
should prevent the statistics from going negative.

(cherry picked from commit 56bb079c8227a2beee609b205c001d66597db98a)
2017-01-24 08:48:28 -05:00
Christopher L. Shannon (cshannon)
f947a74f4a https://issues.apache.org/jira/browse/AMQ-6572
On journal start use lastFileLength instead of maxFileLength when
checking for unused space in the last journal file as it is possible the
length of the last journal file is not the same length as maxFileLength

(cherry picked from commit 0ad62f722fef6c2123ef7acb116a80574a43c250)
2017-01-23 11:04:49 -05:00
Timothy Bish
cab6f73c9d https://issues.apache.org/jira/browse/AMQ-6563
ensure that the lock is always released in the load method.
(cherry picked from commit 281d600ae2f9ba6c6bc7bee0e8025698b9a76563)
2017-01-13 11:49:03 -05:00
Christopher L. Shannon (cshannon)
df7aa6e892 https://issues.apache.org/jira/browse/AMQ-6561
Stop connections on all connection attempt errors, not just security
exceptions, to prevent dangling open sockets.

(cherry picked from commit d9c74d7317677725a52466349f7ed91911664d3d)
2017-01-12 10:22:19 -05:00
Christopher L. Shannon (cshannon)
161ba22f61 https://issues.apache.org/jira/browse/AMQ-6560
Converting flags in TransportConnection to AtomicBoolean to reduce
synchronization and improve thread safety

(cherry picked from commit bdec3f6ddb7f1417690f3c89d07ea77f0d6d96e5)
2017-01-12 07:41:30 -05:00
Christopher L. Shannon (cshannon)
e4da98bd79 https://issues.apache.org/jira/browse/AMQ-6555
Fixing Scheduler so that a rescheduled task will first cancel the
existing task so it does not get orphaned from the task map.  Also
fixing Topic start so that it will only start once and not twice.

(cherry picked from commit 2769298cf64a10cd74320ad132b3677bac20a6cc)
2017-01-10 10:27:44 -05:00
Timothy Bish
71f51dc4c9 Clean up connection resources on failed connect.
(cherry picked from commit 8a34ca0ec742f9d3e71211802ac235a7ae88789b)
2016-12-21 17:19:37 -05:00
Christopher L. Shannon (cshannon)
b36262ebba [maven-release-plugin] prepare for next development iteration 2016-12-19 10:33:54 -05:00
Christopher L. Shannon (cshannon)
58dddb9181 [maven-release-plugin] prepare release activemq-5.14.3 activemq-5.14.3 2016-12-19 10:32:45 -05:00
Christopher L. Shannon (cshannon)
4b599c23ba NO-JIRA: Adding 5.14.3 schemas
(cherry picked from commit 04626d807e5adb850449b6d3b143a569ede837a9)
2016-12-19 10:17:28 -05:00
Christian Schneider
3998cd6367 [AMQ-6544] Create spring.schemas with schemas of activemq and spring
(cherry picked from commit 50dae26788400cef745932535f1c933abdd56637)
2016-12-19 09:21:09 -05:00
Christopher L. Shannon (cshannon)
fc3897af67 https://issues.apache.org/jira/browse/AMQ-6545
Fixing the order of locks acquired in the KahaDB journal to prevent a
deadlock during file rotation

(cherry picked from commit 5fd63a0e4ee71bb93843ab6bfbba6f93b023a3c3)
2016-12-16 13:48:28 -05:00
Daniel Kulp
1c625e116e Add upcoming 5.13.5 release to spring schemas 2016-12-16 13:01:48 -05:00
Timothy Bish
31a79ea584 https://issues.apache.org/jira/browse/AMQ-6536
Add support for the receiver side of a sender link which carries a
desired capabilities array which can request to know if we support
delayed delivery, answer with an offered capability in that case.
(cherry picked from commit 4a1c05b628fbb3c97c394eebc6810a9786daca4e)
2016-12-13 12:37:50 -05:00
Christopher L. Shannon (cshannon)
0225edb471 https://issues.apache.org/jira/browse/AMQ-6538
Fixing an issue with syncDurableSubs that cause a bridge failure when
adding multiple bridges between the same brokers

(cherry picked from commit 25703fbd1f27b65a7410acd7df0bfaf7c16845d8)
2016-12-13 12:00:41 -05:00
Christopher L. Shannon (cshannon)
ae30662fbd https://issues.apache.org/jira/browse/AMQ-6535
Fixing the auto+nio+ssl transport so that the protocol detection task
will properly terminate on timeout and not continue to run. Also
lowered the default detection timeout to 15 seconds instead of 30
seconds to match the InactivityMonitor default.

(cherry picked from commit 27238b2dd790cea38d95da46b23ed141f5847782)
2016-12-12 11:26:26 -05:00
Christopher L. Shannon (cshannon)
80b5fdcf2f https://issues.apache.org/jira/browse/AMQ-6521
Fixing support for Jetty 9.3 and Jetty 9.2.  The previous attempt at a
fix had the wrong class instance.

(cherry picked from commit 29b4db5c34fbb7087bc6a08f3e393da32b39ce66)
2016-12-09 09:47:59 -05:00
Daniel Kulp
d3c5e8188d [AMQ-6529] Make sure the LDAP ACL's are definitely loaded when needed. 2016-12-08 09:39:17 -05:00
Christopher L. Shannon (cshannon)
8d1136e699 [maven-release-plugin] prepare for next development iteration 2016-12-05 09:35:12 -05:00
Christopher L. Shannon (cshannon)
2462711684 [maven-release-plugin] prepare release activemq-5.14.2 activemq-5.14.2 2016-12-05 09:33:48 -05:00
Christopher L. Shannon (cshannon)
973cb4ce52 NO-JIRA: Adding 5.14.2 schema
(cherry picked from commit fa55316b6500f23c28cd02b210ed223412d3e123)
2016-12-05 09:05:46 -05:00
gtully
5b6ce12fc4 [AMQ-6518] - fix up aveMessageSize dest stat and test
(cherry picked from commit cfdff4edc529984deea27067578810498541321c)
2016-12-05 08:45:56 -05:00
gtully
89209d320c [AMQ-6522] - remove hardcoded 32k batch limit from recovery check of the journal, fix and test
(cherry picked from commit dad629e889b2116a778fd4f77680a1b2944b400f)
2016-12-05 08:45:20 -05:00
Christopher L. Shannon (cshannon)
3542657541 https://issues.apache.org/jira/browse/AMQ-6524
Fixing a thread safety issue with memoryUsage when using concurrentStoreAndDispatch
that was causing memory usage to get out of sync.

The InnerFutureTask class inside KahaDB was not thread safe which was
the root cause of the problem.

(cherry picked from commit 0f0bdb21ef97c39ec7d54d164e07921611c1de08)
2016-12-05 07:12:59 -05:00
Christopher L. Shannon (cshannon)
4cdd188ef2 https://issues.apache.org/jira/browse/AMQ-6521
Adding support for Jetty 9.3 by re-adding in the logic to dynamically
load the correct GzipHandler depending on the version

(cherry picked from commit 80f46a80560b2b2ed9fb418c33df75136bc3dc52)
2016-11-29 11:39:17 -05:00
Christopher L. Shannon (cshannon)
a50979e308 https://issues.apache.org/jira/browse/AMQ-6491
Changing the WebSocket servlet to return a succesful empty response
instead of an error when a GET request is made

(cherry picked from commit f40532a23d70639a027fcf87893de8683edf430f)
2016-11-22 07:28:53 -05:00
Christian Schneider
1fc93660c6 [AMQ-6514] Upgrade xbean-blueprint to 4.2 to fix issue with placeholders 2016-11-22 13:16:46 +01:00
Timothy Bish
3597fd9614 https://issues.apache.org/jira/browse/AMQ-6504
Fix intermittent test failure
(cherry picked from commit 2c828b23df991f1e86747d2bcf95329cf1696827)
2016-11-21 12:38:40 -05:00
Timothy Bish
3903ea08ab https://issues.apache.org/jira/browse/AMQ-6505
Fix compilation error on 5.14.x branch
2016-11-18 12:24:12 -05:00
Timothy Bish
65d789b4e1 https://issues.apache.org/jira/browse/AMQ-6500
Better handle prefetch extension and pull consumers over Topics to avoid
the remote not receiving all the messages available based on the credit
it has issued.
(cherry picked from commit e050519ff6ae8079c5183f6e6372ddb3d03e91c7)
2016-11-18 12:18:53 -05:00
Christopher L. Shannon (cshannon)
cc633e6913 https://issues.apache.org/jira/browse/AMQ-6505
Fixing the auto transport protocol detection so that the byte buffer
that captures the initial bytes for detection is not shared across
threads. This was causing failed connections under high load and high cpu
usage under NIO

(cherry picked from commit 7e648d512d06508d85f6a4e111d9adbdb9e33a82)
2016-11-12 10:03:07 -05:00
Timothy Bish
41ce86bd95 https://issues.apache.org/jira/browse/AMQ-6504
Round the start time value not truncate to ensure delay falls on the
correct side of the scheduling block.
(cherry picked from commit 980162233fd3693d1f83d3f95985ac33affa7a8f)
2016-11-11 14:53:35 -05:00
Timothy Bish
35bdd13724 NO-JIRA Add some additional validation.
(cherry picked from commit 097c0e7eae360f376b525448863e86452ebc06cc)
2016-11-11 14:53:31 -05:00
Timothy Bish
56acbc8ef2 https://issues.apache.org/jira/browse/AMQ-6501
Update to latest point releases
(cherry picked from commit 1a75e0f33aa5c5bf1527799a329af5eef25e216e)
2016-11-08 11:11:43 -05:00
Christopher L. Shannon (cshannon)
e9489a45b3 https://issues.apache.org/jira/browse/AMQ-6482
Adding websocket send timeout to AMQP over websockets

(cherry picked from commit 937b2acd4628fdbfe8165db5f97225dddab515e7)
2016-11-04 14:10:23 -04:00
Christopher L. Shannon (cshannon)
fdf1537eb8 https://issues.apache.org/jira/browse/AMQ-6482
Adding a timeout for websocket sends to prevent the transport thread
from getting stuck and blocking.  The default is 30 seconds.

(cherry picked from commit 450cabe4ead1fb78eec2e94013d2868a5bf864da)
2016-11-04 12:59:04 -04:00
Timothy Bish
fd3853c24d https://issues.apache.org/jira/browse/AMQ-6498
Include the already received backlog when deciding to grant additional
credit to avoid excessive backlogs of messages during producer flow
control.
(cherry picked from commit 7cf7fba7aab05ea9c41bf009325c63a6798f6cc8)
2016-11-04 11:56:00 -04:00
Christopher L. Shannon (cshannon)
f9e624a487 https://issues.apache.org/jira/browse/AMQ-6489
Adding a new ActiveMQXASslContextFactory and jndi support for it
in ActiveMQSslInitialContextFactory

(cherry picked from commit 016ae05d0e2697fe53db276d8e6f098d2e9f6f05)
2016-11-04 08:31:53 -04:00
Timothy Bish
ba1eab20d2 https://issues.apache.org/jira/browse/AMQ-6495
State variables shared across threads in the transport need to be marked
volatile.
(cherry picked from commit 629ee285685b5f63315c8fcd6138a37bd17b958d)
2016-11-02 12:58:40 -04:00
Timothy Bish
3642ab1c10 https://issues.apache.org/jira/browse/AMQ-6474
ASYNC_TASKS executor not being shut down on stop with no other users in
service.
(cherry picked from commit d1f42bd01e90abe3fb171834efd46a3594ba2600)
2016-11-02 12:44:58 -04:00
Timothy Bish
0c280fed60 https://issues.apache.org/jira/browse/AMQ-6493
Ensure the proper versions of dependencies for Qpid JMS are brought in
for the test.
(cherry picked from commit c239bf01a9f643fd217ee10efc5992105694b125)
2016-11-01 15:26:57 -04:00
Christopher L. Shannon (cshannon)
fc3206864d https://issues.apache.org/jira/browse/AMQ-6477
Fixing potential concurrent modification exception

(cherry picked from commit 5c80eda321e7edb5f34ffd62c71523310d26b2ca)
2016-11-01 10:32:01 -04:00
Michael L. Bloom
ed4ffaba54 https://issues.apache.org/jira/browse/AMQ-6489
Add support for SSL configurations using JNDI.

(cherry picked from commit 11541e8608807d900f0fd66ef48bbc7c5590ee4c)
2016-10-31 12:48:13 -04:00
Christopher L. Shannon (cshannon)
4cbe692bcc https://issues.apache.org/jira/browse/AMQ-6477
simplifying isMarshalled method

(cherry picked from commit 0a80165a99bff33bfaeeb8fe1dc7b5a8e6f50830)
2016-10-27 15:54:09 -04:00
Timothy Bish
a2c7433e7d https://issues.apache.org/jira/browse/AMQ-6486
Ensure that message with no header is marked as non-persistent.
(cherry picked from commit a2d92ef786ad6fd542afb82543784794321fd13d)
2016-10-26 19:05:11 -04:00