9532 Commits

Author SHA1 Message Date
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
Timothy Bish
d005e1a856 https://issues.apache.org/jira/browse/AMQ-6485
Allow for inspection of Deliveries on Receivers and Delivery updates on
Senders.
(cherry picked from commit cec3245a9fd50ad1850bdf57d3935d42886cefe2)
2016-10-26 15:30:28 -04:00
Timothy Bish
80f877a734 https://issues.apache.org/jira/browse/AMQ-6484
make the validators thread safe
(cherry picked from commit b34336cc0adeb8908580631f979715852458a69b)
2016-10-26 14:49:15 -04:00
Timothy Bish
941b861448 https://issues.apache.org/jira/browse/AMQ-6483
Fix conversion from long to int and back to long again.
(cherry picked from commit 1a91decf9f6dd7305dd91ae6769df78cc4758c82)
2016-10-26 13:28:45 -04:00
Christopher L. Shannon (cshannon)
e0116d0458 https://issues.apache.org/jira/browse/AMQ-6477
ReduceMemoryFootprint now applies to non-persistent messages if they
have been marshalled and topics now clear memory after the recovery
policy check

(cherry picked from commit 7c3bb401007b4047c540287b53b435b20d3161c0)
2016-10-25 10:20:33 -04:00
Timothy Bish
72b642c2d3 https://issues.apache.org/jira/browse/AMQ-6479
Allow a unit test to inspect AMQP frames as part of the test.
(cherry picked from commit 24a79413c66013818795360cf3ecc4489d1e4d5f)
2016-10-24 15:39:48 -04:00
Christopher L. Shannon (cshannon)
2ea6b00eef https://issues.apache.org/jira/browse/AMQ-6476
Moving BrokerSubscriptionInfo processing into a new thread to prevent a
deadlock of the network bridge on startup

(cherry picked from commit b9cb02ae54a27e6c2f3ff934a1f01b88b7af2f11)
2016-10-24 07:52:42 -04:00
Timothy Bish
b0ee133eaf NO-JIRA Add new test to receiver tests
test showing that remote close and not detach is triggered on close of
the receiver.
(cherry picked from commit 1a811b72ddfae5874016de71300e73d8a286a8c6)
2016-10-21 19:40:50 -04:00
Timothy Bish
8f301ed571 NO-JIRA Add new test for session close
Add a test that checks that closing a session does not provoke the
remote to close the session resources explicitly.
(cherry picked from commit bd8f17700c32652883c0372c85f5296276cd1128)
2016-10-21 12:58:06 -04:00
Timothy Bish
9363af6f37 NO-JIRA Add a close method to the session
(cherry picked from commit 4c838c5fa3c83782b1bfaa069f2beb7a87a7beaa)
2016-10-20 17:50:25 -04:00
Christopher L. Shannon (cshannon)
9b6b31ca2f https://issues.apache.org/jira/browse/AMQ-6472
Durable sync over a network bridge will now also sync non-durable
subscriptions proplrly if the consumer belongs to a destination that is
configured to force network durable subscriptions.

(cherry picked from commit d206621a73e4731b00eff49518ea93ba9a4ee3c0)
2016-10-20 13:49:05 -04:00
Christopher L. Shannon (cshannon)
77b827f46e https://issues.apache.org/jira/browse/AMQ-6468
Fixing JSTL tags in JSP pages

(cherry picked from commit c1157fe1f007ee2344a7f0badefa0794c98817cd)
2016-10-17 08:41:05 -04:00
Timothy Bish
335a490eac https://issues.apache.org/jira/browse/AMQ-6467
Fill in the source / target created for the requested dynamic node with
the actual attributes we are going to support.
(cherry picked from commit 10fc397ab72bcd3c111b517af687ccf4c9372ced)
2016-10-14 15:01:25 -04:00
Timothy Bish
cf72e7214d https://issues.apache.org/jira/browse/AMQ-6466
Update to Proton 0.15.0
(cherry picked from commit d9d1ae73eb5d9301df47afff0fd3ebcc0f592ff5)
2016-10-14 13:21:40 -04:00
Christopher L. Shannon (cshannon)
b49df4848e https://issues.apache.org/jira/browse/AMQ-6465
Properly decrementing the message reference count in
DemandForwardingBridgeSupport when messages supression is checked for
durable subscriptions

(cherry picked from commit 406a34294befca4ba2de4b728c86f64b96a94945)
2016-10-14 12:16:36 -04:00
Timothy Bish
d126afc8fe https://issues.apache.org/jira/browse/AMQ-6464
Correct handling of rejected outcome to archive the message in the DLQ
(cherry picked from commit a9f9d4a4d2ede752afa74b22394b80822052543d)
2016-10-14 09:36:03 -04:00
Timothy Bish
70728e97da NO-JIRA: Add some additional test variations and add some more checks
(cherry picked from commit 3e237ca73a9c9af18191ff4a23c456c1d427511e)
2016-10-13 14:29:55 -04:00
Timothy Bish
330deb2c89 NO-JIRA Add some additional testing around outcomes
(cherry picked from commit f71e0ee15b2c456dac28cf456deafb764221afa6)
2016-10-11 18:59:41 -04:00
Timothy Bish
c42f81514b https://issues.apache.org/jira/browse/AMQ-6460
Add better cleanup of connections on test failure.
(cherry picked from commit 1ac89543a8d7f969f84fa51d92c4e1e0d65f1161)
2016-10-07 18:49:46 -04:00
Timothy Bish
37c20ed19f NO-JIRA Add ability to set message reply-to for in tests
(cherry picked from commit 1316b57edba75336e02645abc3a7e8369526b2e8)
2016-10-06 15:52:04 -04:00
Timothy Bish
70432bf31c https://issues.apache.org/jira/browse/AMQ-6444
Fix failing tests
(cherry picked from commit a2995b7614a6e15af7958f78bd412ccab00589bb)
2016-10-06 15:04:04 -04:00
Timothy Bish
e2b1675a29 https://issues.apache.org/jira/browse/AMQ-6444
Remove some unneeded instance of checks and used cached values where
possible.
(cherry picked from commit baef8f8ec20ed3057895f6ec1e02ca6ea75a33a1)
2016-10-06 14:20:56 -04:00
Robert Gemmell
aef6584b3a AMQ-6450: update to qpid-jms-0.11.1
(cherry picked from commit 3239e4f79ef81d80ddae8ae9a318af3a048eb93d)
2016-10-03 16:52:49 +01:00
Christopher L. Shannon (cshannon)
991e97ad94 https://issues.apache.org/jira/browse/AMQ-6449
Disabling doclint now only activates for JDK 8

(cherry picked from commit 72650a0b8b00f281ce6b2e300da2cb4015d25e81)
2016-10-03 07:38:37 -04:00
Christopher L. Shannon (cshannon)
241d9d1565 NO-JIRA: More Java 8 JavaDoc fixes - also fixed findbugs for Java 8
(cherry picked from commit 02082b1aec97140dd62a418d68f2cc029082444e)
2016-09-30 14:37:29 -04:00
Timothy Bish
a6d2a16b4c https://issues.apache.org/jira/browse/AMQ-6438
Better interop for MapMessage with Binary value in the entries of the
payload, should convert back and forth the byte to allow Message to be
treated as a MapMessage and not fall back to a BytesMessage encoding.
(cherry picked from commit d88c4e46ecffdba0040299df6efbcdc4171d1c3d)
2016-09-29 11:12:34 -04:00
Timothy Bish
aa32a0f792 https://issues.apache.org/jira/browse/AMQ-6444
Ensure that unsettled TX messages remain acquired and not redelivered to
the receiver.   Add several tests that demonstrate that a received
message can be released, rejected, accepted or modified after a TX
rollback if it was not settled.
(cherry picked from commit 0dd806f43f3bee9372ee9b9481089d417c265dfe)
2016-09-28 15:08:49 -04:00
Timothy Bish
aebb365ad4 https://issues.apache.org/jira/browse/AMQ-6438
Remove redundant tests and clean up a few small nits.
(cherry picked from commit 45f60e4133f64603d5f1a5161c363eb185d2804d)
2016-09-28 15:08:39 -04:00
Timothy Bish
4575bee670 https://issues.apache.org/jira/browse/AMQ-6438
Add a new test for encode / decode validation.  Fix issue where the
internal scheduled message properties were escaping into the outbound
message.
(cherry picked from commit b1a9a9382b837fb8cff7f9586c7f9516675bf78a)
2016-09-28 15:08:29 -04:00