Commit Graph

8805 Commits

Author SHA1 Message Date
Christopher L. Shannon (cshannon) f10aab6428 https://issues.apache.org/jira/browse/AMQ-5851
resolves #123

This commit resolves an issue where unmatched acknowledgement
messages could be received when running a MDB consumer and
sending messages with a short TTL.  The expiration logic when
receiveing an expired Message Ack will now only expire messages
in dispatch relating to the received ack, not all expired messages
in the dispatch list.
2015-07-09 16:46:21 +01:00
Timothy Bish c9c32e5dc9 Fix test failure in CI 2015-07-09 11:09:26 -04:00
gtully 0f4320d00f fix unchecked warn 2015-07-09 15:09:32 +01:00
gtully 21fb802260 redirecting console output from itest to file - more sanity when scrolling over build 2015-07-09 14:22:32 +01:00
gtully a05a9a2129 https://issues.apache.org/jira/browse/AMQ-5552 - added profile for activemq.tests=smoke to run a fast subset of tests that gives a fast verification of a full build 2015-07-09 14:10:38 +01:00
gtully c454fe31fc remove some unchecked warns 2015-07-09 14:08:05 +01:00
gtully 802e968f93 fix deprecated import warn 2015-07-09 13:39:33 +01:00
Dejan Bosanac 52e4527125 https://issues.apache.org/jira/browse/AMQ-5368 - improve nio ssl handshake performance 2015-07-09 12:53:58 +02:00
gtully 3985e7225f https://issues.apache.org/jira/browse/AMQ-5853 - fix cacheEnabled case - additional test and fix for both jdbc and kahadb stores 2015-07-09 10:30:54 +01:00
Timothy Bish 13044decce https://issues.apache.org/jira/browse/AMQ-5848
Use the latest openwire version marshallers in the KahaDB store when
starting from a clean install, drop back to the version used in the
existing store if one is found.
2015-07-08 17:29:32 -04:00
Timothy Bish b0952d8747 This closes #130 2015-07-08 17:18:17 -04:00
Christopher L. Shannon (cshannon) 73d1bcd7ac https://issues.apache.org/jira/browse/AMQ-5875
Resolves an issue when using mKahaDB that caused a MessageStore
being used by more than one destination to be deleted even though
there was still at least 1 other destination using the store.
2015-07-08 18:32:15 +00:00
Timothy Bish c853bcf436 This closes #129 2015-07-08 13:11:47 -04:00
Christopher L. Shannon (cshannon) 8871b0e496 https://issues.apache.org/jira/browse/AMQ-5748
Fixing an issue that prevented old versions of KahaDB from being
upgraded to the newest version 6
2015-07-08 16:10:11 +00:00
gtully e1c707e813 https://issues.apache.org/jira/browse/AMQ-5856 - fix typo that lead to recursive call - test regression in MQTTConnectTest 2015-07-08 12:18:05 +01:00
gtully 59cd018979 https://issues.apache.org/jira/browse/AMQ-5876 - refactor properties loading such that it can be reused by cert and props login modules. Both loading on start and refreshing if reload=true and lastMod indicates change 2015-07-08 12:07:04 +01:00
Timothy Bish 6f457d2f5c This closes #128 2015-07-07 19:03:42 -04:00
Christopher L. Shannon bd28c3b0ba https://issues.apache.org/jira/browse/AMQ-5748
Fixing a potential Null pointer exception in  MemoryMessageStore
2015-07-07 18:54:06 -04:00
Timothy Bish 1dcdf69f3e This closes #113 2015-07-07 17:02:31 -04:00
Christopher L. Shannon (cshannon) 46055034c9 https://issues.apache.org/jira/browse/AMQ-5837
This commit adds an Inflight message size statistic to SubscriptionStatistics
so we can know the size of all the messages that are inflight, besides just the count.
2015-07-07 16:33:58 -04:00
Timothy Bish 2b320ac065 This closes #92 2015-07-07 16:17:14 -04:00
Christopher L. Shannon (cshannon) 785b16bf9e https://issues.apache.org/jira/browse/AMQ-5748
Added a getMessageSize method to MessageStore to support retrieving the
total message size of all stored messages for a destination.  Added a
new storeMessageSize statistic to DestinationStatistics.
2015-07-07 18:03:27 +00:00
Timothy Bish 7a68ad5d98 https://issues.apache.org/jira/browse/AMQ-4814
Remove of a durable subscription when the keepDurableSubActive flag is
true (default) did not actually stop and cleanup the still active cursor
due to the fact that the cursor checks the flag of its subscription to
see if it should stay active when its stop method is called.  The
subscription needs to disable that flag when the subscription is being
removed so that the cursor will correctly shutdown.
2015-07-06 18:21:20 -04:00
Timothy Bish c38a61d7ae https://issues.apache.org/jira/browse/AMQ-5340
Clean up a bit, extend test timeout to account for slow CI machines,
remove System prints and replace with LOG.
2015-07-06 16:47:58 -04:00
Timothy Bish 3ba28f6221 This closes #127 2015-07-06 16:18:36 -04:00
Christopher L. Shannon 174dcbff2a https://issues.apache.org/jira/browse/AMQ-5340
A QueueBrowser no longer checks expiry on messages to prevent a
browser from hanging in between the hasMoreElements check and actually
getting a message.  This means that if messages were in the queue when
the browser started it will receive messages even if they are now
expired. Even though the browser will get the expired message, the
broker will still expire it to prevent future access to it.

Thanks to Henno Vermeulen for providing a test case.
2015-07-06 16:13:52 -04:00
gtully a2697b844e https://issues.apache.org/jira/browse/AMQ-5853 - track per priority sequence on load from the store. Allow db to select from entire prority 0-9 range. fix and additonal test 2015-07-06 15:32:23 +01:00
gtully b78ef954d2 https://issues.apache.org/jira/browse/AMQ-5853 - fix typo in test combination - ensures expiry does not kick in 2015-07-03 12:18:13 +01:00
gtully eece28ac75 https://issues.apache.org/jira/browse/AMQ-5853 - rework fix, have store reset tracked recovered priority when higer priority messages are stored. Additional perf fix that removes unnecessary 2x multiplier on db fetch size; seems periodic message expiry was throwing some tests when the cache was enabled 2015-07-03 10:30:16 +01:00
gtully fef8cac05f Add sanity check of browse list 2015-07-03 10:30:16 +01:00
Claus Ibsen 5abd2d231a Upgrade jackson and netty 2015-07-03 08:53:39 +02:00
Timothy Bish 455f1ca475 https://issues.apache.org/jira/browse/AMQ-5872
The code that adds subscriptions for retroactive subscribers did not
account for the case where the last ack position in the ackLocations
table is used as a placeholder for the next incoming message and there
may not be an element in the messageReference tracker for that index
especially after restart when the index is reloaded.  The code needed to
check this when it iterates of the existing message references to add a
value so to avoid the NPE.  

Also cleaned up the MQTT tests such that they place their data dir in
./target so that old stores get removed on 'mvn clean'
2015-07-02 17:04:35 -04:00
Timothy Bish 8e7556f397 https://issues.apache.org/jira/browse/AMQ-5600
Add patch with some tweaks submitted by Bernhard Trummer to clean up the
logging for XA TX.
2015-07-02 11:59:11 -04:00
Timothy Bish e4af2eb635 https://issues.apache.org/jira/browse/AMQ-5814
Use the context of the subscription when the producer adds a destination
that matches its wildcard.
2015-07-02 11:36:53 -04:00
Timothy Bish 0c72e5d7dc Fix test name to match its issue: AMQ-5822 2015-07-01 18:00:43 -04:00
Timothy Bish 60ca85c92b Find a free port instead of assuming the local port is free. Should
address CI failure.
2015-07-01 16:54:09 -04:00
Dejan Bosanac a53d4cf7bf https://issues.apache.org/jira/browse/AMQ-5008 - fix the case then crlPath is defined and trustStoreAlgorithm is not PKIX 2015-07-01 12:09:07 +02:00
Timothy Bish 10ae0d9d6f https://issues.apache.org/jira/browse/AMQ-5870
Resolve race that leads to stalled connect attempt.  Should fix the
failing CI tests that are seeing this.
2015-06-30 17:16:47 -04:00
Timothy Bish 87fd0a9e05 This closes #118 2015-06-30 15:01:55 -04:00
Christopher L. Shannon (cshannon) 12b26b641b https://issues.apache.org/jira/browse/AMQ-5745
This commit is based off a patch submitted by admin@int3solutions.com.
It fixes several locations in the code where there are potential resource leaks.
2015-06-30 13:41:48 -04:00
Timothy Bish 1b493749a1 https://issues.apache.org/jira/browse/AMQ-5859
fix for incorrect logic in reconnect attempt limits and also fix a case
where an NPE could occur (saw in the tests).   Based on patch provided
by Benoit Wiart
2015-06-30 13:00:04 -04:00
gtully 91d48280b8 https://issues.apache.org/jira/browse/AMQ-5400 - add test case showing the need for maxSessions config 2015-06-30 11:34:03 +01:00
Marc Schoechlin 6248d0515c Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/activemq 2015-06-30 08:17:58 +02:00
Marc Schoechlin b06c1679b6 check that broker is not running if export is used 2015-06-30 08:16:52 +02:00
Timothy Bish 27edaffded https://issues.apache.org/jira/browse/AMQ-5856
Clean up the MQTT over WebSocket code to allow for handling link
stealing and inactivity monitor.  Ensures that the web socket instances
get cleaned up on errors and avoids leaks that might otherwise arise.
Adds new tests for MQTT over WebSocket.

Adds some missing license headers as well.
2015-06-29 18:35:08 -04:00
Marc Schoechlin 06202097a2 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/activemq 2015-06-29 22:01:14 +02:00
Timothy Bish f3fc589412 This closes #124 2015-06-29 15:28:36 -04:00
Christopher L. Shannon (cshannon) be10b866a7 https://issues.apache.org/jira/browse/AMQ-5865
StompSocket and MQTTSocket will now return the appropriate web socket
remote address based on the HttpRequestServlet that initialized
the web socket connection.
2015-06-29 12:46:43 +00:00
gtully bbf288b12c https://issues.apache.org/jira/browse/AMQ-5639 - fix regression in NetworkRouteTest eashmock test 2015-06-29 12:10:31 +01:00
Marc Schoechlin 3870aa9447 Resolved merge conflict 2015-06-29 08:34:50 +02:00