Commit Graph

9193 Commits

Author SHA1 Message Date
Timothy Bish 8ed1cc59c1 Fix test compilation issue. 2016-07-14 10:32:50 -04:00
Christopher L. Shannon (cshannon) 78cacc5e17 https://issues.apache.org/jira/browse/AMQ-6357
Preventing a divide by 0 error by taking a local reference to the
prefetch size to guarantee that the value doesn't change after the > 0
check

(cherry picked from commit 42dabb7a7a)
2016-07-14 10:17:25 -04:00
Christopher L. Shannon (cshannon) c3d71ebe01 NO-JIRA: Adding schema for 5.13.4
(cherry picked from commit d4dd138216)
2016-07-14 09:48:37 -04:00
Christopher L. Shannon (cshannon) f1642b4244 https://issues.apache.org/jira/browse/AMQ-6356
Fixing store size calculation on KahaUpdateMessageCommand processing so
that the size won't increase inadvertently if the existing location of
the command in the journal is the same as the new location

(cherry picked from commit a5050a8bc5)
2016-07-14 09:22:59 -04:00
Christopher L. Shannon (cshannon) 70e2b92f1b https://issues.apache.org/jira/browse/AMQ-6301
using the proper command name in karaf after upgrading from karaf 2 to
4

(cherry picked from commit 159713298a)
2016-07-13 09:50:24 -04:00
Timothy Bish 3563f14de6 https://issues.apache.org/jira/browse/AMQ-6353
Fix and test for encoding the correlation Id value to the ActiveMQ
message object's string value
(cherry picked from commit 16c487a7b9)
2016-07-12 14:19:51 -04:00
Christopher L. Shannon (cshannon) 9da728407b https://issues.apache.org/jira/browse/AMQ-6301
Updating ActiveMQServiceFactory to avoid using Spring DM directly and
instead use the Camel factory bean if it exists

Reverting back to Camel 2.16.3 until Spring DM is removed and Spring 4
can be used
2016-07-12 12:31:44 -04:00
Seth Leger 982f739e24 AMQ-6301: Changed activemq-osgi so that it embeds the spring-dm bundles
so that we can avoid loading the spring-dm feature which causes Spring
version conflicts.
2016-07-12 12:29:01 -04:00
Christopher L. Shannon (cshannon) 9c483fa477 https://issues.apache.org/jira/browse/AMQ-6352
Fixing PList size tracking by moving the null assignment on removal to
after the onRemoval method is called to make sure that the decrement is
done properly.

(cherry picked from commit d635a36940)
2016-07-12 10:28:36 -04:00
Timothy Bish 85da157238 https://issues.apache.org/jira/browse/AMQ-6350
Allow for PooledConnectionFactory restart after being stopped.
(cherry picked from commit 0706fd0bc1)
2016-07-11 18:21:43 -04:00
Timothy Bish 21cd612098 https://issues.apache.org/jira/browse/AMQ-5886
Ensure we reject protocol version that we don't currently support.
(cherry picked from commit f3544f248f)
2016-07-11 12:18:56 -04:00
Christopher L. Shannon (cshannon) 7342b3760f https://issues.apache.org/jira/browse/AMQ-6345
disabling failed assertion for test as it is expected based on how this
test is usin the client

(cherry picked from commit 667ea7c640)
2016-07-07 18:26:37 +00:00
Christopher L. Shannon (cshannon) bad922c9ef https://issues.apache.org/jira/browse/AMQ-6345
Moving PINGREQ tests into its own test class so they aren't run more
than once

(cherry picked from commit b5b087d558)
2016-07-07 13:55:12 +00:00
Christopher L. Shannon (cshannon) 04464e48ab https://issues.apache.org/jira/browse/AMQ-6345
The MQTT transport will now throw an exception if a PINGREQ is sent to
the broker if a CONNECT packet has not been received first as the spec
says CONNECT must be the first packet sent.

(cherry picked from commit 6dacef1c95)
2016-07-06 16:01:53 +00:00
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 53c9d7ecb6 https://issues.apache.org/jira/browse/AMQ-6305
Lower prefetch on settlement of allow for dispatch of the full amount of
granted credit.  Adds additional tests.
(cherry picked from commit db71b43b19)
2016-07-05 19:55:09 +00:00
Timothy Bish 8916beea42 https://issues.apache.org/jira/browse/AMQ-6305
Refactor credit handling and drain state tracking to ensure we stay in
sync with the remote state and always answer drain requests.  Start
adding some more tests around drain to the interop suite.
(cherry picked from commit 8448cf1cb8)
2016-07-05 19:55:02 +00:00
Timothy Bish 508c12d948 https://issues.apache.org/jira/browse/AMQ-6305
Add test and supporting enhancements to the JUnit module to allow for
easy repetition of tests that don't always fail reliably
(cherry picked from commit 6ae169e275)
2016-07-05 19:54:54 +00:00
Christopher L. Shannon (cshannon) fda982dccb https://issues.apache.org/jira/browse/AMQ-6343
On MQTT Websocket close, a LWT message will be properly sent if
configured and a disconnect packet was not received

(cherry picked from commit bd442a3388)
2016-07-05 18:19:24 +00:00
Christopher L. Shannon (cshannon) 1dfd0eeb60 https://issues.apache.org/jira/browse/AMQ-6346
Prevent concurrent access to the MQTT protocol handlers which can lead
to a tansport level deadlock

(cherry picked from commit 96494f74c7)
2016-07-05 18:18:14 +00:00
Christopher L. Shannon (cshannon) 7ddfa97d01 https://issues.apache.org/jira/browse/AMQ-6194
Fixing an issue that caused statistics for a transactional temporary
queue to be updated twice by mistake.  Moved the statistics update into
tryOrderedCursorAdd so that the update is called immediately only if
not inside a transaction.

(cherry picked from commit 903dec615c)
2016-07-01 10:38:02 +00:00
Timothy Bish 6fda5e3262 https://issues.apache.org/jira/browse/AMQ-6340
combine the lists in the correct order for later redispatch.
(cherry picked from commit 4e23adfcc9)
2016-06-29 13:27:37 -04:00
Timothy Bish 8ae7c8f3a7 https://issues.apache.org/jira/browse/AMQ-6286
Create a follow on test showing AMQP respects order.
(cherry picked from commit e02c1a17f8)
2016-06-29 13:27:17 -04:00
Christopher L. Shannon (cshannon) 6271a7e353 https://issues.apache.org/jira/browse/AMQ-6337
Checking for the correct number of arguments before reflectively
invoking a method in DefaultAuthorizationMap

(cherry picked from commit 6be36305f6)
2016-06-23 20:36:16 +00:00
Timothy Bish 33e70292d4 https://issues.apache.org/jira/browse/AMQ-6334
Fix error handling for connection establishment on the bridge.
(cherry picked from commit 03785a4d53)
2016-06-23 11:04:10 -04:00
Timothy Bish 0afe7d9d24 https://issues.apache.org/jira/browse/AMQ-6328
Update camel to 2.16.3
2016-06-17 16:59:28 -04: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 eb9139dddc https://issues.apache.org/jira/browse/AMQ-6319
Additional fixes and tests for disable of non-SASL client connects.
(cherry picked from commit c5998444cf)
2016-06-10 17:12:16 -04:00
Timothy Bish f471b51c2a https://issues.apache.org/jira/browse/AMQ-6319
Improve configuration for disabling non-SASL connections.
(cherry picked from commit c49db029ab)
2016-06-09 17:33:27 -04:00
Timothy Bish d594248db5 https://issues.apache.org/jira/browse/AMQ-6275
Avoid unnecessary connection state lookup leading to lock ordering
issues.
(cherry picked from commit 98d2000833)
2016-06-09 12:10:47 -04:00
Jonathan Malek 539d6b747a A fix for AMQ-6310
Checking for leading wildcard in the prefix for a virtualtopic,
modifying the behavior of shouldDispatch in the VirtualTopicInterceptor.

(cherry picked from commit 6bf5987921)
2016-06-06 13:17:25 +00:00
Timothy Bish ceeb1f68ac https://issues.apache.org/jira/browse/AMQ-6304
Ensure that the broker send a container ID using its assigned Broker
name value.
(cherry picked from commit 76b70545f2)
2016-06-01 18:39:40 -04:00
Seth Leger 6d539b4f01 AMQ-6298: Moved Spring Import-Package wildcard below other Spring
imports.
2016-05-20 15:15:11 +02:00
Timothy Bish 405280ecce https://issues.apache.org/jira/browse/AMQ-6292
allow for batch writes of forwarded acks.
(cherry picked from commit 15405af2e6)
2016-05-13 14:57:17 -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
Timothy Bish 3a4cdeb91a Add Jaas module needed for new tests. 2016-05-11 17:29:16 -04:00
Timothy Bish 4c45398575 https://issues.apache.org/jira/browse/AMQ-6290
Close failed connection on start if the reconnect on exception flag is
enabled.  
(cherry picked from commit 2e64abc38a)

Conflicts:
	activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/PooledConnectionSecurityExceptionTest.java
2016-05-11 16:16:09 -04:00
Christopher L. Shannon (cshannon) c8a805deff https://issues.apache.org/jira/browse/AMQ-6287
Properly enclosing the indexLock in a try/finally inside of
AckCompactionRunner
2016-05-11 12:35:30 +00:00
Christopher L. Shannon (cshannon) 0ba9f9340f https://issues.apache.org/jira/browse/AMQ-6285
Added an extra isShutdown() failsafe check when detecting if the
checkpoint thread should start

(cherry picked from commit 91213010b3)
2016-05-09 19:36:14 +00:00
Christopher L. Shannon (cshannon) cd68c42b90 https://issues.apache.org/jira/browse/AMQ-6285
Properly nulling out the scheduler service in MessageDatabase after it
is shutdown on a store close so that if the store is restarted the
thread will properly restart.

(cherry picked from commit 7bdcca1bda)
2016-05-09 19:10:24 +00:00
Christopher L. Shannon (cshannon) 6abf89f0a5 https://issues.apache.org/jira/browse/AMQ-6100
Adding missing LICENSE header

(cherry picked from commit b7db97d8e2)
2016-05-05 14:14:23 -04:00
Dejan Bosanac c276e2e652 https://issues.apache.org/jira/browse/AMQ-6100 - Virtual topic message destination should be the target queue
(cherry picked from commit 4e63ee7cc7)
2016-05-05 14:14:11 -04:00
Quinn Stevenson 0e78877f64 AMQ-6274 - set originalDestination for composite destinations
This closes #184

(cherry picked from commit 1ccd17791b)
2016-05-05 11:44:59 -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
Timothy Bish 37b5dbf0ea Add some additional checks for valid state.
(cherry picked from commit 3c342ffce4)
2016-04-28 11:56:52 +00:00
Christopher L. Shannon (cshannon) d38c5906f6 https://issues.apache.org/jira/browse/AMQ-6267
Added two new properties for configuration to a network bridge,
advisoryPrefetchSize and advisoryAckPercentage.  By default
advisoryPrefetchSize is set to 0, which is disabled, and will use the
prefetchSize value unless otherwise set.  Also added validation to
prefetchSize to make sure it is greater than 0 as 0 is not allowed.

(cherry picked from commit 297eadf746)
2016-04-28 11:48:53 +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