9616 Commits

Author SHA1 Message Date
Timothy Bish
6613b8f1f6 AMQ-6699 Fix STOMP over WS not encoding header values
When sending STOMP frames out over WS the marshal isn't doing a proper
encode based on the STOMP version in use and so header values can be
transmitted without proper escaping.
(cherry picked from commit 2490c85fc5cc27cb32f01553784ef6bc63cd15f0)
2017-06-14 15:15:56 -04:00
Christopher L. Shannon (cshannon)
4b4d1defe5 AMQ-6698 - Allow timeout of SSL handshake for auto+nio+ssl
The handshake now takes place inside of the async task that timesout so
that if the SSL handshake takes too long the connection attempt will
honor protocolDetectionTimeout and actually timeout.  Also, change the
default of protocolDetectionTimeout to 30 seconds so it matches the rest
of the broker's default connection timeout settings.

(cherry picked from commit 2a0b785a041f35aa668d2371c9374eb0fd02063c)
2017-06-08 12:34:42 -04:00
Timothy Bish
e38ac94a27 AMQ-6697 Make the MBean explicitly final for java 7 support
(cherry picked from commit 8417ce537b2cb96965827ebfb793f31814ba1ddd)
2017-06-02 14:22:03 -04:00
Timothy Bish
0be8b63fde AMQ-6697 Preserve dispatched state on client-individual tx ack
Need to preserve the messages in the dispatched list when a
client-individual ack comes in so that on abort the state remains
dispatched and the message can still be ack'd
(cherry picked from commit e83bb6dc38ed793ead919e5d7d6d9146816c66a5)
2017-06-02 14:21:54 -04:00
Timothy Bish
1c141eae40 AMQ-6697 Adds a test to show that the described case works
Correctly ACK inside a TX and then Abort and then ACK again outside a TX
to show that the broker will then mark the message as consumed.
(cherry picked from commit bd8661796b190ef605458cdd7a0d90d9af4f51a0)
2017-06-02 14:21:43 -04:00
Christopher L. Shannon (cshannon)
908ef64728 AMQ-6664 - Adding missing header tag to JSP files
Also fixing JSP comments.  This fix is a follow on to
AMQ-6620

(cherry picked from commit 04b60cb188932a91be9f59d6cda09290219d8a45)
2017-05-24 16:24:10 -04:00
Timothy Bish
bf395fcdb3 https://issues.apache.org/jira/browse/AMQ-6680
Fix handling of incoming MQTT binary data over WS.  The handler should
use the MQTTCodec to ensure that partial or packed frames are fully
processed
(cherry picked from commit e69367fbc329aa66a90e33a917b0d4ccd86c015e)
2017-05-22 12:28:02 -04:00
Timothy Bish
bc879d762a https://issues.apache.org/jira/browse/AMQ-6669
Respect the wireFormat.maxFrameSize option on WS and WSS transports
allowing binary content larger than 65535
(cherry picked from commit 2e2d5ddd3de7d0fe36ce5eb3d4fe81e97fe990a4)
2017-05-04 16:39:49 -04:00
Christopher L. Shannon (cshannon)
675729c204 AMQ-6661 - Fix Auto MQTT protocol detection
Protocol detection now takes into account the variable length header in
the CONNECT packet.

(cherry picked from commit 808a4c5c173bf789326d33ed6bbbc7a6544bf8e0)
2017-04-25 08:48:29 -04:00
Timothy Bish
df71790722 https://issues.apache.org/jira/browse/AMQ-6659
Honor the sender settle mode from the client and ensure we always set
receiver mode to FIRST to reflect we don't support SECOND.  Adds tests
coverage and needed test client changes for this.
(cherry picked from commit 381a1ae20611427eddb6a8743e4043c9917cfbbc)
2017-04-21 10:52:26 -04:00
Dejan Bosanac
b345535b7e [maven-release-plugin] prepare for next development iteration 2017-04-11 17:32:46 +02:00
Dejan Bosanac
19adb5d840 [maven-release-plugin] prepare release activemq-5.14.5 activemq-5.14.5 2017-04-11 17:32:24 +02:00
Dejan Bosanac
0057a4bfea NO-JIRA: Adding 5.14.5 schemas 2017-04-11 17:21:07 +02:00
Christopher L. Shannon (cshannon)
0a46ffdb5a https://issues.apache.org/jira/browse/AMQ-6649
Adding MS SQL jdbc driver 6.1 support

(cherry picked from commit 58046194d02bdcfe74fc8717457229d571ac4627)
2017-04-11 10:31:58 -04:00
gtully
0bbb82e7e5 [AMQ-6644] - ensure journal files past last update are not included in the logged gc set in error 2017-04-11 10:31:25 -04:00
gtully
b8a7aa80e5 [AMQ-6652] add final modifier to test
(cherry picked from commit af03ad467987fad7f1ee2d8382ed0acd17432a9b)
2017-04-11 10:27:54 -04:00
gtully
f3a34766a0 [AMQ-6652] ensure checkpoint pagefile flush includeds the checkpoint transaction
(cherry picked from commit ca5e41bb7ab740207795d27ca341634f983f375e)
2017-04-11 10:27:54 -04:00
Hiram Chirino
32a4d74496 Add new implementations of the writeUTF8 and readUTF8 methods that are based on Apache Harmony code. This also avoid some code duplication that was occurring.
(cherry picked from commit 45a1217228bc6fa9ccda49853156a5f71fe2c956)
2017-04-11 16:12:09 +02:00
Timothy Bish
6fe437a3d6 https://issues.apache.org/jira/browse/AMQ-6638
Adds some additional logging to the connection validation code, adds
some additional tests as well.
(cherry picked from commit 0752d840b90a5acdb04410362fb16c943f09dc2f)
2017-04-05 16:21:05 -04:00
Christopher L. Shannon (cshannon)
bd083623df AMQ-6642: Fix potential NPE on updateMessage
Fixing potential NPE when calling updateMessage on a Queue store in
KahaDB if subscription statistics are enabled.  Also reduced the
visibily from public to protected to subscription statistic related
methods that shouldn't be public and added null pointer checks there as
well.

https://issues.apache.org/jira/browse/AMQ-6642
(cherry picked from commit 2731f04f1ca81312d08ffc21c0ceb09513165b7c)
2017-03-31 09:09:17 -04:00
Timothy Bish
c4f8361d52 https://issues.apache.org/jira/browse/AMQ-6629
Allow for broker stats to be viewed in tests by enabling JMX but
disabling the creation of a management connector.
2017-03-15 10:09:05 -04:00
Christian Schneider
dea1accb98 [AMQ-6620] Workaround until the actual issue is fixed in karaf 2017-03-10 16:19:43 +01:00
Timothy Bish
1b73fd6b5f https://issues.apache.org/jira/browse/AMQ-6621
Fix year values and remove an outdated attribution.
(cherry picked from commit ef064953b471164a92c0808781244e9b98920b3b)
2017-03-08 14:12:45 -05:00
Christopher L. Shannon (cshannon)
e124f1db69 AMQ-6377: Storing JournalSyncStrategy as an enum
Switching MessageDatabase to store JournalSyncStrategy as its enum value
instead of String to avoid the performance penalty of comparing Strings
everytime isEnableJournalDiskSyncs() is called which currently happens
on every write.

(cherry picked from commit 0d824a8e6832419cb952ef503504c5296b069ad9)
2017-03-07 08:11:36 -05:00
gtully
7e3f344ea7 [AMQ-6606] - reset next batch so it does not get reused after error and refine fix to sync write batches b/c async locations will already be in the index
(cherry picked from commit 21ae1ef2e658a14f89bde79a83a32af340fb351a)
2017-03-07 08:07:33 -05:00
Dejan Bosanac
b8fc78ec6c https://issues.apache.org/jira/browse/AMQ-6470 - Remove unused ControlCommand handling in client
(cherry picked from commit 338a74dfa42a7b19d39adecacfa5f626a050e807)
2017-03-06 14:54:55 +01:00
gtully
2dfe0c7c29 [AMQ-6603] pull unnecessary guava dep from the new test
(cherry picked from commit eab9a0d05758fd0e8e83e7e482f4f0406cd9af5e)
2017-03-01 11:45:10 -05:00
Timothy Bish
4c5a70421c AMQ-6603 Stop tracking producer if creation failed
Track the message producer create and ensure it is not recreated on
failover if the creation resulted in an error response.  Add failover
level tests to cover consumer and producer failed create tracking.
(cherry picked from commit 90b808ab98b760f06885a5f45628353c9d2224f2)
2017-02-28 16:20:19 -05:00
gtully
5a52bf2a51 [AMQ-6603] ensure failover does not track consumer creation that fails with an exception, fix and test. Thanks for the test Tadayoshi Sato
(cherry picked from commit 8641928553e0f1d97416fd010c2f7d6f165b3660)
2017-02-28 16:20:08 -05:00
Christopher L. Shannon (cshannon)
6d848c440c [maven-release-plugin] prepare for next development iteration 2017-02-27 08:46:14 -05:00
Christopher L. Shannon (cshannon)
308eab0bb6 [maven-release-plugin] prepare release activemq-5.14.4 activemq-5.14.4 2017-02-27 08:45:01 -05:00
Christopher L. Shannon (cshannon)
2c737a32a1 NO-JIRA: Adding 5.14.4 schemas
(cherry picked from commit 67ad35d34289aa16c7fcc8f3ed94bb37882a8529)
2017-02-27 07:56:47 -05:00
Christopher L. Shannon (cshannon)
16de69502f AMQ-6610: Fixing JDBC test
Durable destinations need to always be loaded on connector start

(cherry picked from commit ef84db5e64b7a96a0c5c7271bd88642d940ba7a4)
2017-02-27 07:38:03 -05:00
gtully
22d5b51a0c [AMQ-6606] avoid partial writes to the end of the journal - revert offset increment on ioexception, fix and test
(cherry picked from commit d53b8f8d424e3cf51646b215007fc017717edf44)
2017-02-24 14:20:54 -05:00
gtully
1a67318fe9 [AMQ-6567] ensure gc file removal/move is completed after index updates to avoid dangling index referenced on partial failure. Fix and test
(cherry picked from commit 20522394cc747e64bd9f87e2e0b64d886c4dec62)
2017-02-24 14:17:34 -05:00
Christopher L. Shannon (cshannon)
0ee9420587 AMQ-6610 - Network connector mbean not registered on reload
On network connector add or update after broker start (such as the
runtime plugins) the mbean was not created.  There was also a couple of
other properties not set. Fixed the network connector start to be the
same for normal broker start and runtime reload.

(cherry picked from commit bab0887ed60907d4ccac1824d83371a592f94925)
2017-02-24 14:12:39 -05:00
Christopher L. Shannon (cshannon)
e575157093 AMQ-6602 - fix java 7 incompatibility
(cherry picked from commit 0cf64783d2cbae684f6d2d3e6c46801070f7fd77)
2017-02-24 06:37:55 -05:00
Christopher L. Shannon (cshannon)
789f82b34b AMQ-6602 - Removing lambdas for java 7 compatibility
(cherry picked from commit 1f53b124bcdc41e6241c811f6854c42855deaf6a)
2017-02-23 10:57:32 -05:00
Christopher L. Shannon (cshannon)
7ca411feee AMQ-6606 - fix typo
(cherry picked from commit 79069598b1435cadaef504d8d3de31777b869c59)
2017-02-23 10:22:26 -05:00
Christopher L. Shannon (cshannon)
b6a8c188ff AMQ-6602: Fix race condition in TaskRunnerFactory
Fixing a race condition in TaskRunnerFactory where if multiple threads
call createTaskRunner() at the same time some threads might see the
executor as null (if it hasn't finished initializing) leading to the
creation of extra DedicatedTaskRunner objects instead of sharing a
PooledTaskRunner.

(cherry picked from commit fe5164a404ebcb0879c1b769e16c00f475320419)
2017-02-23 10:20:59 -05:00
Christian Schneider
a85689d73c [AMQ-6605] Properly specify the tag libs we use 2017-02-17 18:11:58 +01:00
Christopher L. Shannon (cshannon)
7c84aca59f AMQ-6599 - Properly apply soTimeout value to TcpTransport
The soTimeout value needs to be applied to the TcpTransport as well as
the socket because the NIO transports use the value later on when
establishing a connection

(cherry picked from commit f6bf823dedba54dea40b597f1762ac6d7308ffa6)
2017-02-17 08:05:27 -05:00
Christian Schneider
2d4b13be3f [AMQ-6597] Do not add the camel component decriptors to activemq-osgi 2017-02-15 14:26:27 +01:00
gtully
727000f112 [AMQ-6587] - fix root cause of deletion candidate seeing sub. contention between adding sub to dests and adding dests to sub, also removing sub from dests twice could leave dest stat negative allowing invalid candidate for gc
(cherry picked from commit d86c98a68772aaa879e6a573fed1ab8382568c9e)
2017-02-10 08:05:35 -05:00
Christopher L. Shannon (cshannon)
3e66eccb55 https://issues.apache.org/jira/browse/AMQ-6595
Fixing tar permissions so that everything is 0755 or 0644 as it should
be

(cherry picked from commit 1d15908e71942ced7e4987273846976753a028f6)
2017-02-08 13:18:26 -05:00
gtully
2d4fb4cbab [AMQ-6587] additional contention window with new sub while gc is in progress - need to verify new sub is actually subscribed to the candidate for deletion. Fix and test
(cherry picked from commit 0ee4f5b84302daf8901363556d038e274c2defd5)
2017-02-07 10:04:44 -05:00
gtully
c5315d6d5e [AMQ-6571] use browsercompatspec cookie matcher - apply patch from Andrew Flegg with thanks
(cherry picked from commit 4f6c55ad67f8e080d5bc3adba124f5e76d9f0224)
2017-02-06 09:13:15 -05:00
gtully
8af72c2157 [AMQ-6587] - fix typo in test that needs 1.7 final
(cherry picked from commit 64b3203713161ee0dd5d8d1dbd74f4c4602f546c)
2017-02-06 09:07:04 -05:00
gtully
95dc0eba2b [AMQ-6587] ensure subs added to new destination before destination is exposed in the destination map. sort gc contention with wildcard subs and anonymous publish. fix and test
(cherry picked from commit e415d2921ec7eabeccdf7db4d1850caa68486de3)
2017-02-06 09:06:56 -05:00
gtully
93715d1bd6 [AMQ-6432] issue was journal scan on newly created ack file. I left the relevant braces from AMQ-6288 in place. Fix and test
(cherry picked from commit 9b64e188b59a395300a2f5d6022df9dbbae2f426)
2017-02-06 09:05:31 -05:00