Commit Graph

432 Commits

Author SHA1 Message Date
Christopher L. Shannon (cshannon) 6bfa13b6e7 https://issues.apache.org/jira/browse/AMQ-5426
Fixing a race condition in ActiveMQMessageConsumer that could cause a
NPE when the consumer is closing

Thanks to Michael Wong for providing the test case for this issue.
2016-07-05 20:05:29 +00:00
Timothy Bish 31c55f7510 https://issues.apache.org/jira/browse/AMQ-6339
Add support for AMQP client to connect using WebSockets.
2016-06-30 14:52:40 -04:00
Timothy Bish 9e856290c4 Add some tests for ClassLoadingAwareObjectInputStream 2016-06-24 12:09:58 -04:00
Dejan Bosanac 3dfda807f6 https://issues.apache.org/jira/browse/AMQ-6336 - queue browser delivers expired messages 2016-06-23 17:47:15 +02:00
Timothy Bish 7b207567d9 https://issues.apache.org/jira/browse/AMQ-6325
Fix issue with selector parser.
2016-06-14 12:49:08 -04:00
gtully 5cc5022d2a https://issues.apache.org/jira/browse/AMQ-6297 - displayName can also be null - thanks tbish 2016-05-20 15:33:33 +01:00
gtully daf7e85e68 https://issues.apache.org/jira/browse/AMQ-6297 - null check for case where interface has no bindings 2016-05-20 14:54:04 +01:00
Timothy Bish cc849e7440 https://issues.apache.org/jira/browse/AMQ-6291
Simplify the selector close in doStop, the run method no longer tries to
close this after it has been registered and assigned.
2016-05-13 11:31:15 -04:00
Timothy Bish ff99872263 https://issues.apache.org/jira/browse/AMQ-6209
Better management of shared resources between the background run thread
and the main start / stop thread.  Makes sure to cleanup all resources
before finally throwing on stop to prevent leaking and resources.
2016-05-13 11:13:28 -04:00
Timothy Bish e996dbe7c2 https://issues.apache.org/jira/browse/AMQ-5954
Use a single destination transformation method instead of having to
different implementations.
2016-04-25 12:22:06 -04:00
Timothy Bish 3e7847aead https://issues.apache.org/jira/browse/AMQ-6126
Ensure the constructors pass along the default value as read from system
property if set.
2016-04-21 13:15:20 -04:00
Timothy Bish 3560d9123d AMQ-6248 fix logging statement to use the connected URI. 2016-04-18 09:53:59 -04:00
Timothy Bish 23a5beb86c https://issues.apache.org/jira/browse/AMQ-6248
Prevent conccurent calls to handleTransportFailure from closing an
already reconnected transport instance.
2016-04-18 09:45:45 -04:00
Timothy Bish c8af70f094 https://issues.apache.org/jira/browse/AMQ-5819
Only apply the initialReconnectDelay on the first reconnection attempt
after a connected transport has failed.
2016-04-15 12:49:49 -04:00
Christopher L. Shannon (cshannon) 9c929b6870 Revert "https://issues.apache.org/jira/browse/AMQ-6218"
Reverting commit in favor of a better approach

This reverts commit ea09159a40.
2016-04-15 11:48:18 +00:00
gtully 530c1a8193 https://issues.apache.org/jira/browse/AMQ-6240 - tidy up test and reduce duration. reuse closeTimeout on rollback during close which is the case here 2016-04-14 12:25:11 +01:00
Timothy Bish aaecdff8b4 https://issues.apache.org/jira/browse/AMQ-6245
Don't log the pull timed out messages that might still be in the
unconsumed list during rollback of unconsumed messages
2016-04-13 16:53:00 -04:00
Brian D. Johnson 7a61718e02 https://issues.apache.org/jira/browse/AMQ-6244 - reset ActiveMQBytesMessage 'compressed' flag after restoring compressed content 2016-04-13 14:19:06 +00:00
gtully 77d46dc139 https://issues.apache.org/jira/browse/AMQ-6240 use sendTimout on sync rollback on close such that a blocked connection won't block a close 2016-04-13 11:55:59 +01:00
Timothy Bish 08d7977402 https://issues.apache.org/jira/browse/AMQ-5462
Remove dead code from session create method.
2016-04-12 19:32:29 -04:00
Christopher L. Shannon (cshannon) e69c2cbad6 https://issues.apache.org/jira/browse/AMQ-6142
Moving the bytes copy to the parent Message class to solve this this
issue for all message types as that is the root cause
2016-04-11 12:31:57 +00:00
Christopher L. Shannon (cshannon) 837da7e582 Revert "https://issues.apache.org/jira/browse/AMQ-6221"
Reverting commit to keep sync out of the client messages

This reverts commit e0c5499964.
2016-04-11 12:17:15 +00:00
Timothy Bish b1c55fdc74 https://issues.apache.org/jira/browse/AMQ-6235
Honor the initialReconnectDelay configuration in all cases.
2016-04-08 12:28:19 -04:00
Timothy Bish 98165c4b69 https://issues.apache.org/jira/browse/AMQ-6228
Create a better error message that for the invalid frame size error.
2016-03-31 16:52:34 -04:00
Timothy Bish 9a866cf567 https://issues.apache.org/jira/browse/AMQ-5486
Default to caller runs policy on task rejection.
2016-03-28 13:55:09 -04:00
Christopher L. Shannon (cshannon) e0c5499964 https://issues.apache.org/jira/browse/AMQ-6221
Synchronizing ActiveMQText message on state changes for the content and
text fields so that they are always changed together.  This will prevent
race conditions where data can be lost when using concurrent store and
dispatch.
2016-03-22 15:51:31 +00:00
Christopher L. Shannon (cshannon) ea09159a40 https://issues.apache.org/jira/browse/AMQ-6218
Fixing copy method of ActiveMQTextMessage to prevent a race condition
when concurrent store and dispatch is used with Queues

We may need explicity synchronization between the text and content fields
in the future if other issues pop up
2016-03-21 19:38:18 +00:00
Timothy Bish e2b4ca2c59 https://issues.apache.org/jira/browse/AMQ-6108
Update the threads created by the SelectorManager to be daemon threads.
2016-03-15 14:03:12 -04:00
Timothy Bish 946e62d702 https://issues.apache.org/jira/browse/AMQ-6203
Rewrite older acks that can be preventing GC of log files.
2016-03-14 11:04:57 -04:00
gtully 078f39f589 https://issues.apache.org/jira/browse/AMQ-6199 - apply CursorMemoryHighWaterMark to topic subscriptions 2016-03-08 16:45:06 +00:00
Dejan Bosanac ca5912d9fa https://issues.apache.org/jira/browse/AMQ-6184 - improve nio transport scalability; get back core pool size 2016-02-25 13:43:21 +01:00
Dejan Bosanac 934a30a327 https://issues.apache.org/jira/browse/AMQ-6184 - improve nio transport scalability 2016-02-25 12:07:51 +01:00
Christopher L. Shannon (cshannon) 0f445a535f https://issues.apache.org/jira/browse/AMQ-6177
Fixing CronParserTest so that it checks 24 hour format properly when
using a timezone shifted by 30 minutes

Thanks to Jamie Goodyear for the patch
2016-02-22 12:50:07 +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
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
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
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
Dejan Bosanac a3fa0da6ec https://issues.apache.org/jira/browse/AMQ-6130 - java beans @Transient annotation 2016-01-18 09:38:09 +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
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
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
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
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
Christopher L. Shannon (cshannon) b9dcb010f7 https://issues.apache.org/jira/browse/AMQ-6077
Making new values in ActiveMQObjectMessage transient which fixes HTTP
serialization
2015-12-15 19:37:05 +00:00
Dejan Bosanac eeec0c07b0 https://issues.apache.org/jira/browse/AMQ-6077 - define default values (based on system property) for connection factory and object message 2015-12-15 13:34:02 +01:00
Dejan Bosanac 94446e53dc https://issues.apache.org/jira/browse/AMQ-6077 - define object message trusted packages on connection factory 2015-12-14 13:50:42 +01:00
gtully c78eddce7e revert sync ack send for https://issues.apache.org/jira/browse/AMQ-3519 due to rework in https://issues.apache.org/jira/browse/AMQ-5068 - sync send no longer needed because redelivered flag is persisted before dispatch. This avoids a roundtrip overhead on individual ack, ie priority or nonBlockingRedelivery options in the mix 2015-12-11 17:05:49 +00:00
gtully 9c4ef26d5c with failover the reported exception may be wrapped by the failover listener 2015-12-09 12:30:29 +00:00
Christopher L. Shannon (cshannon) cfb4ca9f54 [maven-release-plugin] prepare for next development iteration 2015-11-30 13:48:58 +00:00
Christopher L. Shannon (cshannon) abfe038ddf [maven-release-plugin] prepare release activemq-5.13.0 2015-11-30 13:48:11 +00:00
gtully 0a12bcb928 https://issues.apache.org/jira/browse/AMQ-2191 https://issues.apache.org/jira/browse/AMQ-3529 - rework fixes to remove uncertanty from dealing with intettuptedexception. Sync requests will trap interrupts that ocurr while waiting for responses and fail the connection with an interruptedioexception. Interrupts pending before requests will be suppressed, allowing possible clean shutdown. It is not safe to replay openwire ops b/c they are not idempotent, the only safe option is to have a teardown of the broker side state from a close 2015-11-27 12:21:56 +00:00
Timothy Bish 4a27b72377 https://issues.apache.org/jira/browse/AMQ-6042
Apply fix and test from Martin Lichtin to preserve the rollback cause in
all ack modes.
2015-11-20 16:18:27 -05:00
Romain Manni-Bucau 934f3cea7e release the connection even if broker communication fails 2015-11-19 07:48:56 -08:00
gtully 15412bae64 AMQ4221Test - remove system exit as it breaks surefire fork, https://issues.apache.org/jira/browse/AMQ-6004 interrupt causes errors on shutdown. Two are sorted but the check for errors in the logs may still cause intermittent failures 2015-11-18 16:08:29 +00:00
gtully d7a3b9406b https://issues.apache.org/jira/browse/AMQ-6029 - make certs available to tunnle servlet - HttpsNeedClientAuthSendAndReceiveTest regression, add javax.security so login exceptions can propogate over http - https://issues.apache.org/jira/browse/AMQ-6013 2015-11-18 16:08:29 +00:00
Christopher L. Shannon (cshannon) cc81680e10 https://issues.apache.org/jira/browse/AMQ-6027
Adding support for consumers on virtual destinations to create network
demand. This behavior is turned off by default but can be enabled.

For example, if a consumer comes online for a queue that is part of a
VirtualTopic, this will cause a network of brokers to forward messages
because a demand subscription will be created. Same for if a consumer
comes online for a forwarded destination from a composite
destination.

There is also an option to enable flow based on the existence of a
virtual destination if the virtual destination is forwarding to a
Queue.

Full configuration instructions for this feature will be on the wiki page.
2015-11-09 20:07:43 +00:00
gtully 8136e67b40 https://issues.apache.org/jira/browse/AMQ-6016 - ensure xstream inits transients to default values when it bypasses the default creation method through object deserialization. Can make it more general if there are ever more instances of this. It avoids the need to check for null and sync 2015-10-30 12:01:08 +00:00
gtully 9ddd162d25 https://issues.apache.org/jira/browse/AMQ-4361 - implement suggestion from Sam hendley with thanks, avoid the IllegalMonitorStateException 2015-10-22 15:49:44 +01:00
Dejan Bosanac 6f524bfea0 https://issues.apache.org/jira/browse/AMQ-6017 - respect ioBufferSize for nio transport 2015-10-22 11:41:17 +02:00
gtully 5d697cff3b https://issues.apache.org/jira/browse/AMQ-6016 - rework fix for https://issues.apache.org/jira/browse/AMQ-2106 - account group assignment on a per destination basis to prevent modification during consumer ordering 2015-10-21 14:02:56 +01:00
Dejan Bosanac e100638244 https://issues.apache.org/jira/browse/AMQ-6013 - init serializable packages statically 2015-10-20 12:30:57 +02:00
Dejan Bosanac a7e2a44fe8 https://issues.apache.org/jira/browse/AMQ-6013 - restrict classes which can be serialized inside the broker 2015-10-16 15:44:23 +02:00
Christopher L. Shannon (cshannon) 4adc8e4f4e https://issues.apache.org/jira/browse/AMQ-6004
Calling socketHandlerThread.interrupt() on TcpTransportServer stop to
make sure the broker shutsdown cleanly.

Patch applied with thanks to Erik Godding Boye
2015-10-08 12:11:16 +00:00
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