Commit Graph

9139 Commits

Author SHA1 Message Date
Marc Breslow 4a937def7d Fix Impossible Cast issues in MemoryTopicSub:
- recoverSubscription()
-- map is defined as LinkedHashMap<MessageId, Message>
-- msg is defined as <map> entry.getValue() so must be a Message
-- condition if (msg.getClass() == MessageId.class) could never be true
-- no need to cast at all when using generics

- recoverNextMessages()
-- basically same code copy/pasted so same fix

Removed 2 conditions from ServerSessionPoolImpl that would result in impossible casts. Conditions removed were trying to cast ActiveMQQueueSession and ActiveMQTopicSession to ActiveMQSession which is illegal.

Since it isn't obvious what to do if you get an ActiveMQQueueSession or ActiveMQTopicSession from getServerSession() I make it fall back to the else condition which raises an async exception. This is better than getting a ClassCastException at runtime.

Remove impossible cast in MemoryMessageStore
2016-02-01 12:57:50 +00:00
gtully 5af5b59d3b https://issues.apache.org/jira/browse/AMQ-6151 - respect prioritizeMessages for pending and redelivered messages 2016-02-01 12:19:49 +00:00
Christopher L. Shannon (cshannon) 186b5d0f30 https://issues.apache.org/jira/browse/AMQ-6113
Properly set the X-FRAME-OPTIONS header on web responses.
2016-01-29 21:05:35 +00:00
Christopher L. Shannon (cshannon) 7eb25ec50b Revert "https://issues.apache.org/jira/browse/AMQ-6136"
This reverts commit 4ee29c363f.

We need to remove the dependency on Spring DM before doing this
2016-01-29 14:57:11 +00:00
Christopher L. Shannon (cshannon) e0ad700f2c https://issues.apache.org/jira/browse/AMQ-6138
Adding ACTIVEMQ_USER_CLASSPATH to make the ActiveMQ classpath more
extendable by users.  Also fixinng the classpath parsing to use the
right path separator dependening on the environment.
2016-01-28 21:12:10 +00:00
Claus Ibsen eac005a37f AMQ-6149: Lets pre-configure jolokia in the broker 2016-01-28 19:45:15 +01:00
Christopher L. Shannon (cshannon) d0f5c27785 https://issues.apache.org/jira/browse/AMQ-6146
Fixing JSTL tags in the Webconsole
2016-01-28 14:05:45 +00:00
Christopher L. Shannon (cshannon) 27a07431fb NO JIRA - removing unintended commit 2016-01-28 11:44:16 +00:00
Claus Ibsen e0b618ff62 Upgrade Camel 2016-01-28 11:20:49 +01:00
Christopher L. Shannon (cshannon) c6f470266e https://issues.apache.org/jira/browse/AMQ-6143
Updating to taglibs 1.2.3
2016-01-27 21:03:37 +00:00
Daniel Kulp a772b0ef72 Remove a printStackTrace for an exception that is also logged. Produces noise on console 2016-01-27 10:06:36 -05:00
gtully acbe31fcb5 https://issues.apache.org/jira/browse/AMQ-6137 - deal with 'special' escape chars in like selector expression 2016-01-22 15:30:16 +00:00
Christopher L. Shannon (cshannon) 4ee29c363f https://issues.apache.org/jira/browse/AMQ-6136
Switching the version for Spring in features-core.xml to allow Spring
4.x versions.
2016-01-21 16:09:30 +00:00
Timothy Bish 4ecff14030 NO-JIRA Update master version to 5.14.0-SNAPSHOT to match the eventual
release version.
2016-01-20 12:40:20 -05:00
Christopher L. Shannon (cshannon) b4aa53d806 https://issues.apache.org/jira/browse/AMQ-6133
Fixing the processing of KahaUpdateMessageCommand to add the message to
the store if it doesn't exist, instead of ignoring it.  This will
prevent message loss in certain cases when the KahaDB index has to be
rebuilt.
2016-01-20 16:59:07 +00:00
Timothy Bish 193f6be687 https://issues.apache.org/jira/browse/AMQ-6131
Fix check for durable sub with no pending messages during checkpoint
cleanup.
2016-01-18 17:43:18 -05:00
Christopher L. Shannon (cshannon) 1ae29382e1 https://issues.apache.org/jira/browse/AMQ-6129
Fixing DynamicallyIncludedDestinationsDuplexNetworkTest
2016-01-18 15:27:11 +00:00
Dejan Bosanac a3fa0da6ec https://issues.apache.org/jira/browse/AMQ-6130 - java beans @Transient annotation 2016-01-18 09:38:09 +01:00
Claus Ibsen df868fe4a3 Polished 2016-01-17 10:20:37 +01:00
Timothy Bish 4ea435bf46 https://issues.apache.org/jira/browse/AMQ-5336
URI comparison needs to be done using the host / port comparison method
instead of string equality due to other features like nested options
which can alter the URIs and lead to continued attempts to reconnect to
the transport that's already connected when priority backup is used.
2016-01-15 18:07:56 -05:00
Christopher L. Shannon (cshannon) 7b7e362465 https://issues.apache.org/jira/browse/AMQ-6129
fixing typo
2016-01-15 15:09:37 +00:00
Christopher L. Shannon (cshannon) 10c998b0bc https://issues.apache.org/jira/browse/AMQ-6129
Adding NetworkBridgeStatistics and also a received count for bridges
when they are in duplex mode.
2016-01-15 14:54:04 +00:00
gtully 2b84cd60ba https://issues.apache.org/jira/browse/AMQ-6128 - fix and test - fix values on priority ordered pending - messages assigned to browsers need to be ordered 2016-01-15 14:31:09 +00:00
Timothy Bish 5b73ffad6b https://issues.apache.org/jira/browse/AMQ-6117
Test to try and reproduce the issue.
2016-01-14 18:28:08 -05:00
Timothy Bish 5adbafef3b https://issues.apache.org/jira/browse/AMQ-6108
Ensure that executor threads are created as daemon threads, fix a
try/finaly block, clean up some warnings.
2016-01-14 16:47:23 -05:00
Timothy Bish ebcc1b4eae https://issues.apache.org/jira/browse/AMQ-6126
Add more configuration options to TaskRunnerFactory
2016-01-14 10:41:56 -05:00
Timothy Bish 9287055338 https://issues.apache.org/jira/browse/AMQ-6125
Ensure that the redelivery policy is never null in the consumer.
2016-01-13 18:08:18 -05:00
Timothy Bish b9805f7ac0 NO-JIRA Update test to ACK in transacted batches to group Ack values to
avoid the test failure based on the even spread of acks across journal
files preventing file GC which causes the test to fail.
2016-01-12 13:51:56 -05:00
Timothy Bish 505a76a8bb https://issues.apache.org/jira/browse/AMQ-6059
Ensure that a message sent to the store for the DLQ is rewritten so that
its updated values are written to prevent exirpation loops and loss of
reollback cause etc.
2016-01-12 11:51:48 -05:00
gtully db1506a592 https://issues.apache.org/jira/browse/AMQ-6124 - fix and test - propagate broker info from prestarted backup transport 2016-01-12 14:00:13 +00:00
Timothy Bish 66cfc7bab3 AMQ-6121
AMQ-6122

Prevent messages on DLQ for looping back onto the same DLQ.  Prevents
expired messages from bouncing back and duplicate messages from the
store from causing a deadlock.
2016-01-11 10:57:38 -05:00
Altaflux 3bb7e4a5c8 Network of brokers on duplex mode reports InstanceAlreadyExistsException on already existing destinations
https://issues.apache.org/jira/browse/AMQ-6052
closes #164
2016-01-11 12:59:33 +00:00
Altaflux 6b1e87410d Network of brokers on duplex mode reports InstanceAlreadyExistsException on already existing destinations 2016-01-11 12:59:33 +00:00
Claus Ibsen 8f6baf8188 Polished 2016-01-11 13:34:48 +01:00
Dejan Bosanac 5f8a3df5a4 https://issues.apache.org/jira/browse/AMQ-6116 - improve security context 2016-01-08 17:05:58 +01:00
Christopher L. Shannon (cshannon) 43d493e527 https://issues.apache.org/jira/browse/AMQ-6112
Fixing file permissions in assembly tar.  Some permissions were not
being set explicitly which means the value used could change depending
on where the assembly was built. Permissions are now being set to fix
this.
2016-01-07 15:33:46 +00:00
Christopher L. Shannon (cshannon) b7db97d8e2 https://issues.apache.org/jira/browse/AMQ-6100
Adding missing LICENSE header
2016-01-06 15:49:50 +00:00
Christopher L. Shannon (cshannon) 8317208a1b https://issues.apache.org/jira/browse/AMQ-6106
Merging in new JUnit Rule for ActiveMQ unit testing

Patch applied with thanks to Quinn Stevenson

This closes #163
2016-01-06 15:10:55 +00:00
Quinn Stevenson da3b138023 Initial Version of activemq-junit
Added configure method to EmbeddedActiveMQBroker

Added support for XBean configuration
2016-01-06 15:10:02 +00:00
gtully 16bc0f0d75 https://issues.apache.org/jira/browse/AMQ-6089 - support TMNOFLAGS as a scan end to allow looping calls to recover to terminate 2016-01-06 12:54:20 +00:00
gtully e3df09b9db https://issues.apache.org/jira/browse/AMQ-6094 - regression via https://issues.apache.org/jira/browse/AMQ-6014 - incorrect ref count on message expiry event during cursor move for dispatch. Fix and test - thanks for the test 2016-01-05 14:09:16 +00:00
Christopher L. Shannon (cshannon) 8e2176d93c https://issues.apache.org/jira/browse/AMQ-6109
The chooseValue method in DestinationMap will now always return the
exact match, if there is one, else it will then sort as before.
2015-12-28 16:41:14 +00:00
Timothy Bish 19ea5515c8 https://issues.apache.org/jira/browse/AMQ-6107
Remove the deprecated setPrefetch option
2015-12-22 16:16:23 -05:00
Timothy Bish 8906a53ae5 https://issues.apache.org/jira/browse/AMQ-6105
Remove deprecated methods from JMX tree
2015-12-22 13:33:36 -05:00
Christopher L. Shannon (cshannon) 35627d9d68 https://issues.apache.org/jira/browse/AMQ-6104
Updating to Spring framework 4.1.9.RELEASE
2015-12-22 15:46:42 +00:00
Christopher L. Shannon (cshannon) fc4c697d44 NO JIRA - cleanup imports 2015-12-22 13:11:28 +00:00
Timothy Bish 564d55023e https://issues.apache.org/jira/browse/AMQ-6102
Call to the statistics instance of the subscription to reset the
counters.
2015-12-21 17:03:24 -05:00
Timothy Bish 7525729363 AMQ-6030 Adds some advisory topic specific tests to cover the composite
case for destination advisories.
2015-12-21 16:24:29 -05:00
Timothy Bish ddd2812279 https://issues.apache.org/jira/browse/AMQ-6101
Update to v0.7.0 of Qpid JMS client libraries.
2015-12-21 12:44:41 -05:00
Christopher L. Shannon (cshannon) 507d40a79f https://issues.apache.org/jira/browse/AMQ-6097
Fixing JournalCorruptionEofIndexRecoveryTest class

Because of the size being stored in the message order index, the test
testRecoveryAftercorruptionCheckSumExistingIndex was no longer passing
as that test was corrupting the size value in the journal, but not the
size value in the index.  The test now corrupts both values so that the
expect exception occurs again.
2015-12-21 16:46:47 +00:00