Commit Graph

877 Commits

Author SHA1 Message Date
Christopher L. Shannon (cshannon) fc3206864d https://issues.apache.org/jira/browse/AMQ-6477
Fixing potential concurrent modification exception

(cherry picked from commit 5c80eda321)
2016-11-01 10:32:01 -04:00
Michael L. Bloom ed4ffaba54 https://issues.apache.org/jira/browse/AMQ-6489
Add support for SSL configurations using JNDI.

(cherry picked from commit 11541e8608)
2016-10-31 12:48:13 -04:00
Christopher L. Shannon (cshannon) e0116d0458 https://issues.apache.org/jira/browse/AMQ-6477
ReduceMemoryFootprint now applies to non-persistent messages if they
have been marshalled and topics now clear memory after the recovery
policy check

(cherry picked from commit 7c3bb40100)
2016-10-25 10:20:33 -04:00
Christopher L. Shannon (cshannon) 9b6b31ca2f https://issues.apache.org/jira/browse/AMQ-6472
Durable sync over a network bridge will now also sync non-durable
subscriptions proplrly if the consumer belongs to a destination that is
configured to force network durable subscriptions.

(cherry picked from commit d206621a73)
2016-10-20 13:49:05 -04:00
Christopher L. Shannon (cshannon) b49df4848e https://issues.apache.org/jira/browse/AMQ-6465
Properly decrementing the message reference count in
DemandForwardingBridgeSupport when messages supression is checked for
durable subscriptions

(cherry picked from commit 406a34294b)
2016-10-14 12:16:36 -04:00
Christopher L. Shannon (cshannon) 991e97ad94 https://issues.apache.org/jira/browse/AMQ-6449
Disabling doclint now only activates for JDK 8

(cherry picked from commit 72650a0b8b)
2016-10-03 07:38:37 -04:00
Christopher L. Shannon (cshannon) 241d9d1565 NO-JIRA: More Java 8 JavaDoc fixes - also fixed findbugs for Java 8
(cherry picked from commit 02082b1aec)
2016-09-30 14:37:29 -04:00
Christopher L. Shannon (cshannon) 9ab56d59cc [maven-release-plugin] prepare for next development iteration 2016-09-27 13:06:49 -04:00
Christopher L. Shannon (cshannon) 594c79e531 [maven-release-plugin] prepare release activemq-5.14.1 2016-09-27 13:06:12 -04:00
gtully ebbb7ab437 https://issues.apache.org/jira/browse/AMQ-6422 - match proton sender view credit to prefetchExtension - tracking credit to dispatch delta to track additional flow requests. Proton sender layer is distinct from the transport layer - they mirror each other 2016-09-27 12:15:50 -04:00
Christopher L. Shannon (cshannon) 02d53a0d9f Revert "[maven-release-plugin] prepare release activemq-5.14.1"
This reverts commit 422b231c25.
2016-09-27 11:57:35 -04:00
Christopher L. Shannon (cshannon) 354142adf1 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 47a652ef2a.
2016-09-27 11:57:25 -04:00
Christopher L. Shannon (cshannon) 47a652ef2a [maven-release-plugin] prepare for next development iteration 2016-09-27 08:58:13 -04:00
Christopher L. Shannon (cshannon) 422b231c25 [maven-release-plugin] prepare release activemq-5.14.1 2016-09-27 08:57:19 -04:00
Christopher L. Shannon (cshannon) e0c70b843f https://issues.apache.org/jira/browse/AMQ-6430
Modifying patch so that only stores that persist the noLocal flag will
check if this flag has changed to prevent a subscription from being
deleted by mistake

(cherry picked from commit 18571ce09b)
2016-09-23 11:26:22 -04:00
Christopher L. Shannon (cshannon) d3b86e77dd https://issues.apache.org/jira/browse/AMQ-6430
When a nolocal durable consumer reconnects the new connectionId is properly captured for
the NoLocal expression so that nolocal works on reconnect.  Also fixed
the detection of the nolocal value changing on consumer connect.

(cherry picked from commit 7c293b661f)
2016-09-21 09:35:38 -04:00
gtully 1d1c9262fd AMQ-6406 - ensure duplicates trapped by the cursor-add or queue-page-in are removed from the message store
(cherry picked from commit 2b1cda1964)
2016-09-08 15:36:15 -04:00
gtully cf004c205d AMQ-6413 - ensure audit update on skipped store add for kahadb concurrentStoreAndDispatch. Fix and test
(cherry picked from commit f8bc19b96d)
2016-09-08 15:35:32 -04:00
Christopher L. Shannon (cshannon) 5956bdc1f5 https://issues.apache.org/jira/browse/AMQ-6423
Fixing durable sync over a network bridge so that network subscriptions
that are no longer permissible are also cleaned up

(cherry picked from commit a038655605)
2016-09-08 08:29:03 -04:00
Christopher L. Shannon (cshannon) c4bc626fea https://issues.apache.org/jira/browse/AMQ-6420
Properly copying wire format options map before applying to the
transport when using auto transports so that the options do not get
cleared and will be used for all future connections

(cherry picked from commit 9ab94883a8)
2016-09-07 07:44:07 -04:00
Christopher L. Shannon (cshannon) c99eb1d600 https://issues.apache.org/jira/browse/AMQ-6418
Properly setting the transport properties on the
AutoNIOSSLTransportServer and fixing the Stomp protocol to set the peer
certs when using auto+ssl

(cherry picked from commit 98c5866c75)
2016-09-06 10:19:20 -04:00
Christopher L. Shannon (cshannon) 679f0cfd31 https://issues.apache.org/jira/browse/AMQ-6414
Changing the nio+ssl transports to trigger a serviceRead after start up
to prevent blocking. The prevents the channels from not reading in
certain cases, most notably with the auto+nio+ssl transport when used
for a network bridge.  Also added a couple tests and changed a network
bridge test to test out auto+nio+ssl.

(cherry picked from commit ed0e786b60)
2016-09-06 10:19:20 -04:00
Timothy Bish fb24b48b8a https://issues.apache.org/jira/browse/AMQ-6387
Fix up the Memory Store such that it removes the references it adds to
messages when they are placed into the memory durable topic subscription
store.
(cherry picked from commit bb8d32c04a)
2016-09-01 16:27:56 -04:00
Christopher L. Shannon (cshannon) a99edb8175 https://issues.apache.org/jira/browse/AMQ-6067
The JDBCMessageStore now checks hasSpace() when running a message
recovery listener to prevent going past the max configured page size

(cherry picked from commit b9fad53fc6)
2016-08-26 13:52:18 -04:00
Christopher L. Shannon (cshannon) a35371d880 NO-JIRA : creating 5.14.x branch 2016-08-02 09:30:31 -04:00
Christopher L. Shannon (cshannon) 71cbc65283 [maven-release-plugin] prepare release activemq-5.14.0 2016-08-02 09:02:54 -04:00
Christopher L. Shannon (cshannon) eb9c584fbd https://issues.apache.org/jira/browse/AMQ-6373
More tests and cleanup
2016-08-01 12:27:34 -04:00
Christopher L. Shannon (cshannon) e73ab34837 https://issues.apache.org/jira/browse/AMQ-6383
https://issues.apache.org/jira/browse/AMQ-6373

Adding a new flag that can be specified on a network bridge to allow
forcing of subscriptions to be durable.  Cleaned up some unit tests.
2016-08-01 10:02:56 -04:00
Christopher L. Shannon (cshannon) b1c4b1871f https://issues.apache.org/jira/browse/AMQ-6373
Moving some test code into a shared support class
2016-07-30 08:35:24 -04:00
Christopher L. Shannon (cshannon) 82295fd2c6 https://issues.apache.org/jira/browse/AMQ-6381
Fixing DurableTopicSubscription so that an ack will properly update the
forwards statistic on an ack
2016-07-29 15:56:52 -04:00
Christopher L. Shannon (cshannon) dd971a00f2 https://issues.apache.org/jira/browse/AMQ-6379
Removed unreliable check from unit test
2016-07-29 12:27:58 -04:00
Christopher L. Shannon (cshannon) 7118247b65 https://issues.apache.org/jira/browse/AMQ-6379
Fixing unit test so that it uses a random port and changing the default
platform details to be "java" if there is an error
2016-07-28 13:10:44 -04:00
Michael L. Bloom 8d5e84bb67 AMQ-6379 - Add openwire properties for provider name, provider version,
and platform details
2016-07-28 12:25:13 -04:00
Christopher L. Shannon (cshannon) cf3d419528 https://issues.apache.org/jira/browse/AMQ-6375
Adding non-blocking metrics to KahaDB to track message counts and sizes
for subscriptions.  Turned off by default but can be enabled on the
KahaDBPersistenceAdapter
2016-07-26 12:02:44 -04:00
gtully 2985651609 AMQ-6370 - speed up the test and wait a bit longer for sends in slow ci 2016-07-26 14:06:02 +01:00
gtully 01cfa7727d AMQ-6361 - fix additional test regression on topic sub expiry AMQ4083Test,MessageEvictionTest 2016-07-26 13:45:41 +01:00
Christopher L. Shannon (cshannon) 3953b9aaef https://issues.apache.org/jira/browse/AMQ-6373
Adding a new OpenWire command called BrokerSubscriptionInfo in order to
help synchronize durable subs across a network bridge.  Added OpenWire
version 12.  For dynamicallyIncludedDestination durable subs will now be
synchronized on a bridge reconnect as long as the bridge supports
conduitSubscriptions and dynamicOnly=false
2016-07-25 11:56:13 -04:00
gtully ad657cc202 AMQ-6370 - ensure derby instance is created 2016-07-25 13:41:05 +01:00
gtully 6cc2c1190d AMQ-6361 - fix contention over expiry processing with expiry task and client expiry ack, unit test regression sorted. 2016-07-22 15:18:31 +01:00
gtully 2a815c2e08 AMQ-6370 - move cleanup lock to connection allocation to avoid contention with between store and connection pool. pool connection grant or block is now guarded by store lock which lasts till connection is closed 2016-07-21 10:54:40 +01:00
Christopher L. Shannon (cshannon) 39184e2fb0 https://issues.apache.org/jira/browse/AMQ-6366
Fixing the duplex bridge case for restarting durable subscriptions when
dynamicOnly is false
2016-07-19 11:31:44 -04:00
Timothy Bish f43c090809 https://issues.apache.org/jira/browse/AMQ-6362
Add option connectResponseTimeout to allow a stuck connection in
ensureConnectionInfoSent from stalling out a client.  Timeout is
disabled by default.
2016-07-18 11:30:38 -04:00
Timothy Bish a3a5a1affa https://issues.apache.org/jira/browse/AMQ-6336
Ensure that when expired messages are handled client side that pull
consumers get a chance to see it and send a new pull request complete an
outstanding timed pull.
2016-07-15 16:45:35 -04:00
Timothy Bish cd5ea6c27f https://issues.apache.org/jira/browse/AMQ-6361
Honor the expired ack from the client as the authority on expiration
2016-07-15 15:08:26 -04:00
Christopher L. Shannon (cshannon) d635a36940 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.
2016-07-12 10:27:57 -04:00
Christopher L. Shannon (cshannon) c02bc64846 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.
2016-07-05 20:35:07 +00:00
Christopher L. Shannon (cshannon) 3856c3999a Revert "https://issues.apache.org/jira/browse/AMQ-5426"
This reverts commit 6bfa13b6e7.
2016-07-05 20:27:02 +00:00
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
gtully 30ff378a35 increase service logging, seems npe in the mix on intermittent failure 2016-07-05 14:08:43 +01: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