Commit Graph

373 Commits

Author SHA1 Message Date
Christopher L. Shannon (cshannon) 8812cb9b8e https://issues.apache.org/jira/browse/AMQ-5426
Fixing a race condition in ActiveMQMessageConsumer that could cause a
NPE when the consumer is closing by only modifing pendingAck inside of
the deliveredMessagesMutex

Thanks to Michael Wong for providing the test case for this issue.

(cherry picked from commit c02bc64846)
2016-07-05 20:38:59 +00:00
Christopher L. Shannon (cshannon) 72c3a6d0b4 Revert "https://issues.apache.org/jira/browse/AMQ-5426"
This reverts commit 2ec32b67af.
2016-07-05 20:38:53 +00:00
Christopher L. Shannon (cshannon) 2ec32b67af 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.

(cherry picked from commit 6bfa13b6e7)
2016-07-05 20:08:07 +00:00
Timothy Bish 8d114f058d https://issues.apache.org/jira/browse/AMQ-6325
Fix issue with selector parser.
(cherry picked from commit 7b207567d9)
2016-06-14 12:50:02 -04:00
Timothy Bish 52d2b15780 https://issues.apache.org/jira/browse/AMQ-6291
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.  
(cherry picked from commit ff99872263)

Conflicts:
	activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
2016-05-13 11:29:25 -04:00
Christopher L. Shannon (cshannon) e82e5c5e3c [maven-release-plugin] prepare for next development iteration 2016-04-28 12:28:08 +00:00
Christopher L. Shannon (cshannon) f2f130b3c8 [maven-release-plugin] prepare release activemq-5.13.3 2016-04-28 12:27:29 +00:00
Christopher L. Shannon (cshannon) 4c109cf273 Revert "[maven-release-plugin] prepare release activemq-5.13.3"
This reverts commit c49ab9fb51.
2016-04-28 11:47:44 +00:00
Christopher L. Shannon (cshannon) 2e9c35bf26 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit ff2241d795.
2016-04-28 11:47:32 +00:00
Christopher L. Shannon (cshannon) ff2241d795 [maven-release-plugin] prepare for next development iteration 2016-04-26 13:32:03 +00:00
Christopher L. Shannon (cshannon) c49ab9fb51 [maven-release-plugin] prepare release activemq-5.13.3 2016-04-26 13:31:15 +00:00
Timothy Bish 2796c0f5d7 https://issues.apache.org/jira/browse/AMQ-6126
Ensure the constructors pass along the default value as read from system
property if set.
(cherry picked from commit 3e7847aead)
2016-04-21 13:15:55 -04:00
Timothy Bish 46dadf9866 https://issues.apache.org/jira/browse/AMQ-6248
Prevent conccurent calls to handleTransportFailure from closing an
already reconnected transport instance.  
(cherry picked from commit 23a5beb86c)

Conflicts:
	activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
2016-04-18 09:53:04 -04:00
Timothy Bish 2f935a260b https://issues.apache.org/jira/browse/AMQ-5819
Only apply the initialReconnectDelay on the first reconnection attempt
after a connected transport has failed.
(cherry picked from commit c8af70f094)
2016-04-15 12:50:57 -04:00
Christopher L. Shannon (cshannon) 4a3fa320e7 Revert "https://issues.apache.org/jira/browse/AMQ-6218"
This reverts commit 93bc7030e2.
2016-04-15 13:05:06 +00:00
Timothy Bish 857254b75b 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
(cherry picked from commit aaecdff8b4)
2016-04-13 16:59:39 -04:00
Brian D. Johnson 7894d8a9a1 https://issues.apache.org/jira/browse/AMQ-6244 - reset ActiveMQBytesMessage 'compressed' flag after restoring compressed content
(cherry picked from commit 7a61718e02)
2016-04-13 15:22:32 +00:00
Timothy Bish 2a7255ab2c https://issues.apache.org/jira/browse/AMQ-6203
Rewrite older acks that can be preventing GC of log files.
(cherry picked from commit 946e62d702)
2016-04-12 12:33:17 +00:00
Christopher L. Shannon (cshannon) 20e84d63e0 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

(cherry picked from commit e69c2cbad6)
2016-04-11 12:33:04 +00:00
Christopher L. Shannon (cshannon) 078da5e7f8 Revert "https://issues.apache.org/jira/browse/AMQ-6221"
This reverts commit 6c2a825ebb.
2016-04-11 12:19:15 +00:00
Christopher L. Shannon (cshannon) 6c2a825ebb 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.

(cherry picked from commit e0c5499964)
2016-03-22 18:51:12 +00:00
Christopher L. Shannon (cshannon) 93bc7030e2 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

(cherry picked from commit ea09159a40)
2016-03-21 19:42:00 +00:00
Timothy Bish e0081014bf https://issues.apache.org/jira/browse/AMQ-6108
Update the threads created by the SelectorManager to be daemon threads. 
(cherry picked from commit e2b4ca2c59)

Conflicts:
	activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
2016-03-15 14:06:09 -04:00
Christopher L. Shannon (cshannon) 369a430538 [maven-release-plugin] prepare for next development iteration 2016-03-01 16:39:41 +00:00
Christopher L. Shannon (cshannon) 6a2e71f11c [maven-release-plugin] prepare release activemq-5.13.2 2016-03-01 16:39:02 +00:00
Christopher L. Shannon (cshannon) a1f309ea19 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

(cherry picked from commit 0f445a535f)
2016-02-22 12:51:51 +00:00
Christopher L. Shannon (cshannon) 0715d09a95 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.

(cherry picked from commit 90726a60af)
2016-02-08 16:14:21 +00:00
Christopher L. Shannon (cshannon) 86e51d2461 [maven-release-plugin] prepare for next development iteration 2016-02-02 17:11:44 +00:00
Christopher L. Shannon (cshannon) d60b73402c [maven-release-plugin] prepare release activemq-5.13.1 2016-02-02 17:11:03 +00:00
Christopher L. Shannon (cshannon) aaa2fdd541 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.

(cherry picked from commit 5f7a81f928)
2016-02-01 17:37:32 +00:00
Timothy Bish 1d9fdbcbea 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.
(cherry picked from commit 5adbafef3b)
2016-01-14 16:47:59 -05:00
gtully 741ee01e11 https://issues.apache.org/jira/browse/AMQ-6124 - fix and test - propagate broker info from prestarted backup transport
(cherry picked from commit db1506a592)
2016-01-14 15:57:55 +00:00
Timothy Bish 543851ba54 https://issues.apache.org/jira/browse/AMQ-6126
Add more configuration options to TaskRunnerFactory
(cherry picked from commit ebcc1b4eae)
2016-01-14 10:43:56 -05:00
Timothy Bish b32be1bb11 https://issues.apache.org/jira/browse/AMQ-6125
Ensure that the redelivery policy is never null in the consumer.
(cherry picked from commit 9287055338)
2016-01-13 18:09:54 -05:00
Christopher L. Shannon (cshannon) 63f045e5c9 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.

(cherry picked from commit 8e2176d93c)
2015-12-29 12:46:59 +00:00
Christopher L. Shannon (cshannon) f6c242ad64 https://issues.apache.org/jira/browse/AMQ-6077
Making new values in ActiveMQObjectMessage transient which fixes HTTP
serialization

(cherry picked from commit b9dcb010f7)
2015-12-16 14:39:27 +00:00
Dejan Bosanac 9aa6bdcf6e https://issues.apache.org/jira/browse/AMQ-6077 - define default values (based on system property) for connection factory and object message
(cherry picked from commit eeec0c07b0)
2015-12-15 12:52:00 +00:00
Dejan Bosanac 5e02e305ea https://issues.apache.org/jira/browse/AMQ-6077 - define object message trusted packages on connection factory
(cherry picked from commit 94446e53dc)
2015-12-14 19:12:28 +00:00
gtully f8488916c2 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
(cherry picked from commit c78eddce7e)
2015-12-11 17:34:35 +00:00
gtully 0952866273 with failover the reported exception may be wrapped by the failover listener
(cherry picked from commit 9c4ef26d5c)
2015-12-09 09:20:36 -05:00
Christopher L. Shannon (cshannon) 95fc593975 Update version for next patch release iteration. 2015-11-30 14:35:26 +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