Commit Graph

9108 Commits

Author SHA1 Message Date
gtully b0c0441d09 https://issues.apache.org/jira/browse/AMQ-6171 - fix vm transport replacement of : from brokerName in error, fix networkConnector retry logic in the event of localTransport creation failure 2016-02-15 14:14:19 +00:00
Christopher L. Shannon (cshannon) 24ad367785 https://issues.apache.org/jira/browse/AMQ-6170
Fixing X-Frame-Options header so that is applied for all content served
by Jetty.  The previous patch wasn't correct because it only applied it
to Servlets and JSPs and not static content. This also reverts AMQ-6113
2016-02-12 20:43:45 +00:00
Timothy Bish b595b8bc12 https://issues.apache.org/jira/browse/AMQ-6169
Log actual STOMP frames that cause error at trace level, only log the
command action if it is present and valid.
2016-02-12 13:56:50 -05:00
Timothy Bish adf70bc08a https://issues.apache.org/jira/browse/AMQ-6168
Disconnect on unkown STOMP Command Action.
2016-02-12 12:36:39 -05:00
Christopher L. Shannon (cshannon) 3e4bf2df75 https://issues.apache.org/jira/browse/AMQ-6165
Merging Python Stomp example fixes

This closes #168
2016-02-12 16:44:05 +00:00
Ingo Weiss f89e8c5d25 Clarified and updated instructions
Updated the example to match stompest API changes
2016-02-12 16:43:45 +00:00
Claus Ibsen 40ecf22f0f AMQ-6166: Add option to configure trustAllPackages on Camel ActiveMQ component 2016-02-11 12:04:24 +01:00
gtully 499e39e52c https://issues.apache.org/jira/browse/AMQ-6164 - allow journal write batching on a single destination 2016-02-09 12:50:27 +00:00
Christopher L. Shannon (cshannon) 90726a60af https://issues.apache.org/jira/browse/AMQ-6153
Only setting the socketBufferSize in TcpTransport if the value is
greater than 0 as other values are illegal.
2016-02-08 16:13:01 +00:00
Timothy Bish 386210fafe https://issues.apache.org/jira/browse/AMQ-6159
Ensure proper repeat counts are scheduled.
2016-02-04 17:16:58 -05:00
Christopher L. Shannon (cshannon) 33dded13df https://issues.apache.org/jira/browse/AMQ-6036
Slight refactoring to make the WildcardFinder class use a static method
so that we don't have to allocate throw away objects that will
immediately be garbage collected.
2016-02-04 16:53:02 +00:00
Christopher L. Shannon (cshannon) 5eeb62a6be https://issues.apache.org/jira/browse/AMQ-6036
Merging patch, thanks to Patrik Dudits for the fix

This closes #156
2016-02-04 16:09:13 +00:00
Patrik Dudits 278d29dadc https://issues.apache.org/jira/browse/AMQ-6036
Parsing message selector for wildcard matches for ignoreWildcardSelectors feature
2016-02-04 16:51:51 +01:00
Christopher L. Shannon (cshannon) 25ff5699f1 https://issues.apache.org/jira/browse/AMQ-6158
Computing messageSize for a durable subscription in KahaDB now runs much
faster (n vs n^2) which is noticable when there are a large number of
pending messages for a durable subscription.
2016-02-04 15:17:49 +00:00
gtully c17b7fdc7f add trace level log to shared file locker keepAlive 2016-02-04 13:28:59 +00:00
Timothy Bish 8c4b5f485d https://issues.apache.org/jira/browse/AMQ-6152
Ensure that when add / remove commands are colocated they don't prevent
the log from being GC'd once it is unreferenced.
2016-02-02 20:28:24 -05:00
Christopher L. Shannon (cshannon) 5f7a81f928 https://issues.apache.org/jira/browse/AMQ-6142
Fixing a race condition that exists in the decompress method of
ActiveMQBytesMessage that can cause an invalid length to be read.
2016-02-01 17:27:19 +00:00
Christopher L. Shannon (cshannon) 161730fda2 https://issues.apache.org/jira/browse/AMQ-6150
code cleanup
2016-02-01 13:04:07 +00:00
Christopher L. Shannon (cshannon) 9361bc6a0f https://issues.apache.org/jira/browse/AMQ-6150
merging patch to fix casting issues

Thanks for Marc Breslow for the patch

This closes #166
2016-02-01 13:03:01 +00:00
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