Commit Graph

9624 Commits

Author SHA1 Message Date
Sami Nurminen f4e7cd1b1d AMQ-6327 - getNextScheduledTime() returns incorrect time when working with day of month 2017-12-20 21:37:35 -05:00
Christopher L. Shannon (cshannon) a5d32da8a1 AMQ-6847 - fix compilation for java 7 2017-12-19 07:27:30 -05:00
gtully 185160c0da [AMQ-6847] limit the retry loop to one iteration overa all pending messages such that new additions are not replayed to avoid duplicates
(cherry picked from commit 03b19b9da4)
2017-12-19 07:19:19 -05:00
gtully e62705aa9d [AMQ-6847] pause dispatch for message move to avoid redelivery with pending ack/remove/audit rollback
(cherry picked from commit 2ea5d1420b)
2017-12-19 07:19:10 -05:00
Carlo Dapor 30edca5b22 [AMQ-6601] AMQ with master and slave broker, shutting down slave causes dead-lock. 2017-12-18 23:04:52 -05:00
Christopher L. Shannon (cshannon) 8ff18c5e25 AMQ-6871 - By default only send generic platform details
The default behavior by the OpenWire client will be to send generic
platform details to the server with a new flag to send more specific
information.

(cherry picked from commit 5fa0bbd515)
2017-12-06 08:42:46 -05:00
Timothy Bish 42e4a6cd99 AMQ-6765 Add trace logging of start failure exception
Log the exception at trace level when start fails.

(cherry picked from commit 56bed30c64)
2017-07-11 16:19:51 -04:00
Timothy Bish 3b5a4d7078 NO-JIRA update the AMQP tests to use the client close timeout
Use the client built in close timeout instead of the executor which can
leave threads running and causes the tests to take much longer than
needed.
(cherry picked from commit ce551cf97d)
2017-06-15 17:14:09 -04:00
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 2490c85fc5)
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 2a0b785a04)
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 8417ce537b)
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 e83bb6dc38)
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 bd8661796b)
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 04b60cb188)
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 e69367fbc3)
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 2e2d5ddd3d)
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 808a4c5c17)
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 381a1ae206)
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 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 58046194d0)
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 af03ad4679)
2017-04-11 10:27:54 -04:00
gtully f3a34766a0 [AMQ-6652] ensure checkpoint pagefile flush includeds the checkpoint transaction
(cherry picked from commit ca5e41bb7a)
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 0752d840b9)
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 2731f04f1c)
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 ef064953b4)
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 0d824a8e68)
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 21ae1ef2e6)
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 338a74dfa4)
2017-03-06 14:54:55 +01:00
gtully 2dfe0c7c29 [AMQ-6603] pull unnecessary guava dep from the new test
(cherry picked from commit eab9a0d057)
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 90b808ab98)
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 8641928553)
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 2017-02-27 08:45:01 -05:00
Christopher L. Shannon (cshannon) 2c737a32a1 NO-JIRA: Adding 5.14.4 schemas
(cherry picked from commit 67ad35d342)
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 ef84db5e64)
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 d53b8f8d42)
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 20522394cc)
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 bab0887ed6)
2017-02-24 14:12:39 -05:00
Christopher L. Shannon (cshannon) e575157093 AMQ-6602 - fix java 7 incompatibility
(cherry picked from commit 0cf64783d2)
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 1f53b124bc)
2017-02-23 10:57:32 -05:00
Christopher L. Shannon (cshannon) 7ca411feee AMQ-6606 - fix typo
(cherry picked from commit 79069598b1)
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 fe5164a404)
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 f6bf823ded)
2017-02-17 08:05:27 -05:00