Commit Graph

317 Commits

Author SHA1 Message Date
erik-wramner 9a78bc689f https://issues.apache.org/jira/browse/AMQ-5961
Prevent deadlock by moving calls to afterCommit
and afterRollback out of synchronized blocks.

https://issues.apache.org/jira/browse/AMQ-5961
Lock list but keep global hashmap out for deadlock protection.

https://issues.apache.org/jira/browse/AMQ-5961
Lock safely in isInXATransaction.

https://issues.apache.org/jira/browse/AMQ-5961
Don't synchronize on list as we have an exclusive reference.
2015-10-01 13:31:00 +00:00
gtully fc25535748 https://issues.apache.org/jira/browse/AMQ-5854 - fix intermittent test failure 2015-09-30 11:41:08 +01:00
gtully 8514e38135 https://issues.apache.org/jira/browse/AMQ-5951 - scenario wheere transaction command can block, additional test and further fix 2015-09-30 11:41:08 +01:00
gtully 8d982479e9 https://issues.apache.org/jira/browse/AMQ-5854 - fix and test. Ensure transaction rollback if there are pending acks during a failover reconnect. Reliably tracking pending acks to eusure possible redelivery is too complex in the context of acks getting dropped by failover or ignored by the subscription, in addition to being sent async. Couple that with multiple consumers on the same connection and the locking of message delivery; only safe course is to ensure rollback outcome. 2015-09-28 14:29:57 +01:00
Dejan Bosanac ee4672baaf https://issues.apache.org/jira/browse/AMQ-5972 - wildcard policy entries not applied in correct order 2015-09-17 11:08:21 +02:00
gtully ae9af4b8b2 https://issues.apache.org/jira/browse/AMQ-5951 - ensure failover oneway won't retry if reconnect will not happen 2015-08-31 15:55:44 +01:00
Christopher L. Shannon (cshannon) e14aca871c https://issues.apache.org/jira/browse/AMQ-5889
-Cleaned up missing license headers and refactored packages.
-Added configuration options for a protocol detection timeout and
for the max number of connections accepted at the same time.
-Fixed a regression with connection counts
-Also added some more tests
2015-08-13 14:41:29 +00:00
gtully e5a94bfee2 https://issues.apache.org/jira/browse/AMQ-5794 - duplex network case calls start twice and would start a connect check timer in error. Fix is to only start connectiontimeout if we have not already started the rest of the monitoring 2015-08-12 16:07:34 +01:00
Christopher L. Shannon (cshannon) 04ee70a161 https://issues.apache.org/jira/browse/AMQ-5889
Adding support for auto detection of wire protocols over a transport.
OpenWire, AMQP, STOMP, and MQTT can all be detected and the broker
will properly handle each one over a given Transport.  Currently
auto TCP, NIO, SSL, and NIO+SSL transports can handle auto-detection
of the wire format and client but support could be added in the
future for other transports like websockets.
2015-08-11 19:39:29 +00:00
Timothy Bish 6cdd750ddc [maven-release-plugin] prepare for next development iteration 2015-08-10 11:04:26 -04:00
Timothy Bish a9eeb03520 [maven-release-plugin] prepare release activemq-5.12.0 2015-08-10 11:04:17 -04:00
Timothy Bish 41ee3ec8de https://issues.apache.org/jira/browse/AMQ-5921
Add back support for type void and test.
2015-08-07 11:00:44 -04:00
Timothy Bish d8c0ff1417 Fix javadoc warnings. 2015-08-05 19:01:08 -04:00
Timothy Bish 61b2f6b40e Fix some javadoc warnings and spelling errors in the docs. 2015-08-05 18:13:42 -04:00
Christopher L. Shannon (cshannon) 457dbd8b64 https://issues.apache.org/jira/browse/AMQ-5919
Converting printStackTrace statements to slf4j so that exceptions
are logged properly
2015-08-05 16:29:29 +00:00
Timothy Bish da36f78a6a https://issues.apache.org/jira/browse/AMQ-5596
Remove some additional references to old JMS Streams properties.
2015-08-03 17:11:44 -04:00
Timothy Bish 3348ade99b https://issues.apache.org/jira/browse/AMQ-5914
Ensure a new pull request is sent, adds test.
2015-08-03 14:41:56 -04:00
Christopher L. Shannon (cshannon) 310c2bb059 https://issues.apache.org/jira/browse/AMQ-5857
Fixing a potential race condition in the storeContent
method of ActiveMQTextMessage
2015-07-31 18:32:02 +00:00
Timothy Bish b84413a314 https://issues.apache.org/jira/browse/AMQ-5907
recompute the timeout value and send a new pull request if the message
received exceeds the configure redelivery maximum.
2015-07-30 17:17:55 -04:00
Christopher L. Shannon (cshannon) 84ec047d2f https://issues.apache.org/jira/browse/AMQ-5857
Changing ActiveMQTextMessage to clear out the text field on marshal to
a ByteSequence to prevent the data from being stored in memory twice.
2015-07-30 16:59:05 +00:00
Timothy Bish b9b27b968b https://issues.apache.org/jira/browse/AMQ-5893
Ensure that unacknowledged messages are removed from the Audit so they
are able to be redelivered to another consumer on this connection
2015-07-16 10:46:11 -04:00
gtully c85c7c1472 AMQ-5400 - rework to remove static lock - impacted parallel delivery and hense performance. Fix and additional tet 2015-07-16 12:38:52 +01:00
Dejan Bosanac ad8879d283 https://issues.apache.org/jira/browse/AMQ-5368 - improve nio ssl handshake performance - use soTimeout for handshake selector 2015-07-13 13:34:22 +02:00
Timothy Bish 18300c6514 https://issues.apache.org/jira/browse/AMQ-5621
Clean up, convert all to JUnit 4 style tests, replace system.out calls
with loggers.
2015-07-10 17:14:48 -04:00
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
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
Dejan Bosanac 52e4527125 https://issues.apache.org/jira/browse/AMQ-5368 - improve nio ssl handshake performance 2015-07-09 12:53:58 +02: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
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
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
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
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
gtully 002ade79b0 https://issues.apache.org/jira/browse/AMQ-5639 - the duplex case needed work. All advisories were being acked async in duplex mode, that code needed to be more selective to forward advisories that dont terminate at the bridge. Fix and test 2015-06-26 14:54:29 +01:00
Andy Taylor 26eb103b92 https://issues.apache.org/jira/browse/AMQ-5400
replace throwable with runtime exception
2015-06-22 16:41:05 +01:00
gtully b22184ebf6 fix intermittent failure with thread accounting test VmTransportNetworkBrokerTest, it did not lie. ci 2015-06-19 12:36:32 +01:00
Timothy Bish 833d30837b https://issues.apache.org/jira/browse/AMQ-5848
Introduce OpenWire v11 which adds noLocal to the SubscriptionInfo, if
configured KahaDB can store that version and the noLocal value is
recovered from the store.
2015-06-18 14:25:07 -04:00
gtully ffef4dc5fa https://issues.apache.org/jira/browse/AMQ-5844 - patch and test applied with thanks to Ganesh Murthy - ganeshmurthy 2015-06-16 15:54:11 +01:00
Andy Taylor 151e25117b https://issues.apache.org/jira/browse/AMQ-5400
improved the patch because of some test failures
2015-06-15 16:28:44 +01:00
Andy Taylor c9a3202bc3 https://issues.jboss.org/browse/ENTMQ-780
pauses the delivery of messages to the activemq session when a rollback is happening until the message has been redelivered.

patch applied with thanks to Tamas Cserveny
2015-06-08 15:51:44 +01:00
Timothy Bish 848adc4b5d https://issues.apache.org/jira/browse/AMQ-5822
Update the receive counter on reads to avoid dropping connections
wrongly.
2015-06-03 10:10:48 -04:00
Hadrian Zbarcea 9810e61b1b [AMQ-5789] Add support for keystore type (other than jks) 2015-06-02 22:01:35 -04:00
Timothy Bish df06bdabdc https://issues.apache.org/jira/browse/AMQ-5816
Apply patch from Ievgen Tarasov that ensures that the data locator is
initialized when a MessageId is deserialized.
2015-06-01 17:50:20 -04:00
Timothy Bish 8e183db030 https://issues.apache.org/jira/browse/AMQ-5794
Lower a couple LOG statements down to trace
2015-05-26 14:24:04 -04:00
Timothy Bish 3125caee5b https://issues.apache.org/jira/browse/AMQ-5794
implement transport.connectAttemptTimeout option across the transports
fro OpenWire, STOMP, AMQP and MQTT and add tests to cover.
2015-05-26 12:29:23 -04:00
gtully 2536c03125 fix sync on failover updated urls - intermittent failure on FailoverComplexClusterTest 2015-05-20 09:57:05 +01:00
gtully 3ef5389691 https://issues.apache.org/jira/browse/AMQ-4897 - rework with test that shows the blocking inactivity monitor task. Removed some redundant state 2015-05-12 22:10:57 +01:00
Christopher L. Shannon (cshannon) b679c8d4d2 Added an uncaught exception handler to ThreadPoolExecutor getExecutor()
method to log errors in threads.

This resolves https://issues.apache.org/jira/browse/AMQ-5750

This closes #93
2015-05-08 16:11:44 -04:00
Timothy Bish 9ef4259297 https://issues.apache.org/jira/browse/AMQ-5616
Use ConcurrentMap in declarations
2015-04-28 11:15:08 -04:00