9013 Commits

Author SHA1 Message Date
Christopher L. Shannon (cshannon)
785041d20f https://issues.apache.org/jira/browse/AMQ-6082
Propertly re-setting the storeOpenWireVersion from the BrokerService
on the KahaDB Metadata if a corrupted index is detected and the
Metadata has to be recreated.

(cherry picked from commit 7a7c70ad7524594339c4388b897fa1eac6988928)
2015-12-08 20:13:33 +00:00
gtully
c67590104b https://issues.apache.org/jira/browse/AMQ-5454 https://issues.apache.org/jira/browse/AMQ-6070 - in the case of duplicates from the store the regiondestination was not set
(cherry picked from commit 88ec9dad9dc47790a3fc4e0f5ad939ea5530dad7)
2015-12-08 09:51:37 -05:00
gtully
558dcc0479 https://issues.apache.org/jira/browse/AMQ-6070 - rework for virtual topic case, use the destination from the transient region destination rather than the message, such that consumer queue advisories work for delivered etc
(cherry picked from commit 179dc3acb28a8a7fc3c1eddf6c6ac54fe49836a5)
2015-12-08 09:51:23 -05:00
Christopher L. Shannon (cshannon)
1ebfa9ade2 https://issues.apache.org/jira/browse/AMQ-6080
fixing typos

(cherry picked from commit 5772e7bed88198f57fabb08c2f48a1de68dea72c)
2015-12-08 13:19:31 +00:00
Timothy Bish
6e2252d083 https://issues.apache.org/jira/browse/AMQ-6074
Make the transportConnector configs consistent across all four variants
by removing the enableCipherSuites option on openwire NIO+SSL.  RC4 was
enabled on the broker side but in later JDK releases that suite is
disbaled as it is insecure so the client side couldn't find a supported
suite.
(cherry picked from commit 315147c5ef3d545a868c74fe55d8ea7efb09f1d1)
2015-12-07 12:28:54 -05:00
Christopher L. Shannon (cshannon)
a4845253d0 https://issues.apache.org/jira/browse/AMQ-6073
WSServlet for websockets will attempt to detect the subprotocol
requested and respond with the appropriate one.  Currently the protocols
loaded are what stomp.js use for stomp (v11.stomp and v12.stomp).
If a protocol can't be found then a default will be returned, either
"stomp" or "mqtt", which is the same behavior before this patch.

This will make it a bit easier to use stomp over websockets out of the
box as stomp.js will work by default.

(cherry picked from commit 913f64476b66c452fa03cb4fb8c09d831825bca5)
2015-12-07 15:33:36 +00:00
Torsten Mielke
11ebaccd64 https://issues.apache.org/jira/browse/AMQ-6071 - Log info about corrupted journal records at WARN level
(cherry picked from commit 66c348b1b85e341ed508b9c10028c037a226dfb6)
2015-12-04 15:23:57 -05:00
gtully
e1cf0d2678 https://issues.apache.org/jira/browse/AMQ-6070 - set correct originalDestination property value in advisories
(cherry picked from commit 75ff17af414b98dbdd891f66b9425692ca799fcc)
2015-12-03 09:00:27 -05:00
Christopher L. Shannon (cshannon)
819e512138 https://issues.apache.org/jira/browse/AMQ-6062
Updated QueueBrowserSubscription to use a ConcurrentMap to avoid a
potential race condition when multiple queue browsers browse
multiple queues.

(cherry picked from commit d346a765e3064a951c5d55119b80b8432a45bcb6)
2015-12-02 15:53:59 +00:00
Christopher L. Shannon (cshannon)
db87a051ca https://issues.apache.org/jira/browse/AMQ-6069
Fixed contains method in PrioritizedPendinList which was not returning
correctly.  This was causing messages to not be removed from the
dispatchPendingList when purge was called inside a Queue leading to an
eventual OOM error if enough messages were purged. This fix also
improves performance of the contains method.

(cherry picked from commit 8363c99b51a98eb176e6baea82fcafce3225ba2c)
2015-12-02 13:42:42 +00: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 activemq-5.13.0 2015-11-30 13:48:11 +00:00
gtully
f09000d1e6 https://issues.apache.org/jira/browse/AMQ-6065 - ensure no call to exit. fix mock test to account for extra call 2015-11-30 13:24:19 +00:00
gtully
1bef4de4dc Revert "https://issues.apache.org/jira/browse/AMQ-6065"
CPL dependency is not fully compatable with ASF and is not really necessary

This reverts commit 39a20bd788c664105c18886abf77c372cf9229aa.
2015-11-30 13:24:18 +00:00
Christopher L. Shannon (cshannon)
1499f2eee0 Adding 5.13.0 to schemas file 2015-11-30 12:34:17 +00:00
Christopher L. Shannon
39a20bd788 https://issues.apache.org/jira/browse/AMQ-6065
Fixed test case so that a System.exit call will not take down the
JVM and cause the test suite to abort in Jenkins early
2015-11-29 10:05:27 -05:00
Christopher L. Shannon
673c2928a1 https://issues.apache.org/jira/browse/AMQ-6066
Improving performance of OrderedPendingList contains method

Thanks for David Sitsky for the patch
2015-11-28 13:25:53 -05:00
gtully
2aa172f905 https://issues.apache.org/jira/browse/AMQ-6065 - allow ioexception handler to flip the systemExitOnShutdown broker attribute before calling stop, i.e: exit on store io errors 2015-11-27 14:21:20 +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
Christopher L. Shannon (cshannon)
95f58fa7c4 https://issues.apache.org/jira/browse/AMQ-6027
Adding back in test case now that AMQ-5898 is resolved
2015-11-25 19:13:24 +00:00
Christopher L. Shannon (cshannon)
29d943429c https://issues.apache.org/jira/browse/AMQ-5393
Reverting commit because allowing 0 doesn't actually set the usage to
0 size.  It ends up disabling the check all together which was the
opposite intention of the commit.

This reverts commit 3b658f8e1aa8c9170b8d414fe8cd05c6826b490a.
2015-11-25 17:59:41 +00:00
Christopher L. Shannon (cshannon)
8f30866fdf https://issues.apache.org/jira/browse/AMQ-6063
Fixing potential NullPointerException during KahaDB index recovery.
2015-11-25 16:02:52 +00:00
Christopher L. Shannon (cshannon)
35b7ac250b https://issues.apache.org/jira/browse/AMQ-5898
Removing assertion in VirtualDestinationInterceptor to allow
multiple composite destinations to forward to a physical destination
2015-11-25 13:33:32 +00:00
Christopher L. Shannon (cshannon)
3b658f8e1a https://issues.apache.org/jira/browse/AMQ-5393
Allowing disk limit percentages to be 0
2015-11-25 13:18:59 +00:00
Christopher L. Shannon (cshannon)
9acee62877 https://issues.apache.org/jira/browse/AMQ-5963
Making unit test more robust
2015-11-24 20:40:10 +00:00
Christopher L. Shannon (cshannon)
e07809dec6 NO JIRA - Clear journalSize counter
The journalSize counter should be set to 0 after KahaDB is shut down.
Usually, a store is not restarted again after stopping, but if it ever
was the value would be wrong since it wasn't reset back to 0.
2015-11-24 17:53:34 +00:00
Timothy Bish
ef129c21cd NO-JIRA ensure each test has a store with its own directory. 2015-11-24 11:17:25 -05:00
Dejan Bosanac
9bc28214d5 https://issues.apache.org/jira/browse/AMQ-6060 - retain will message 2015-11-24 14:13:32 +01:00
Timothy Bish
d9e22a9368 https://issues.apache.org/jira/browse/AMQ-6044
Clean up some test client code.
2015-11-23 16:55:11 -05:00
Christopher L. Shannon (cshannon)
bc9edf00d1 https://issues.apache.org/jira/browse/AMQ-6058
Updating patch to make sure SelectorAwareVirtualTopics are covered
and code cleanup
2015-11-23 20:35:32 +00:00
Christopher L. Shannon (cshannon)
bf36c4cb88 This closes #159 2015-11-23 20:31:53 +00:00
Chad Zobrisky
dca6e4506e AMQ-6058 added a check to make sure the destination starts with the virtual topic prefix. 2015-11-23 20:10:26 +00:00
Timothy Bish
8be1486508 NO-JIRA: Add a delay to fail in case an async operation has not fully
created the DLQ yet.
2015-11-23 14:24:06 -05:00
Daniel Kulp
4c1a6b4c2b Add Martyn's key so we can keep the KEYS files in sync 2015-11-23 12:28:37 -05:00
gtully
4318eba4a3 https://issues.apache.org/jira/browse/AMQ-6014 - topic store prefetch should take ownership like in the non persistent case - DurableSubscriberNonPersistentMessageTest regression 2015-11-23 12:27:03 +00:00
gtully
48fbd3116d test for transacted send and ack camel route with explicit set of connection factory necessary due to config clone across component endpoints 2015-11-23 12:27:03 +00:00
Christopher L. Shannon (cshannon)
3a3dcac184 https://issues.apache.org/jira/browse/AMQ-5957
Updating several dependencies to the latest
2015-11-22 19:56:27 +00:00
Christopher L. Shannon (cshannon)
bbde8473bd https://issues.apache.org/jira/browse/AMQ-5980
Fixing an intermittent test failure in:

org.apache.activemq.transport.ws.StompWSSTransportTest.
testHeartbeatsKeepsConnectionOpen

Adding synchronization on sends for StompWSConnection.  The protocol
doesn't allow multiple threads to call a blocking send at the same time
and the heartbeat keep alive thread was colliding with the main
thread on sends.
2015-11-22 19:01:31 +00:00
Christopher L. Shannon (cshannon)
de5d0d9430 https://issues.apache.org/jira/browse/AMQ-5854
Fix intermittent test failure caused by the test reconnecting before
the failure assertion had a chance to assert the expected failure
2015-11-22 18:36:38 +00:00
Timothy Bish
272fb2b973 https://issues.apache.org/jira/browse/AMQ-6044
Add support for transactions to the test client.
2015-11-20 17:48:14 -05: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
Christopher L. Shannon (cshannon)
cc6213ebf2 https://issues.apache.org/jira/browse/AMQ-5712
Switching addMessageLast to tryAddMessageLast when messages are added
to a Queue pending cursor to allow a potential deadlock to be
avoided. There is more work to be done here but this will at least
prevent a deadlock from occurring.

Fix and test based off of a patch created by Timothy Bish.
2015-11-20 20:58:27 +00:00
Timothy Bish
b5dd0a16f4 https://issues.apache.org/jira/browse/AMQ-6055
Account for Authzid in SASL PLAIN mechanism and provide a means to fail
the authorization if the challenge response is invalid.  Update the
client to properly exclude sasl mechanism that don't apply to it's
configured credentials such as using only ANONYMOUS when no user or
password is set.
2015-11-20 14:39:03 -05:00
Robert Gemmell
d7e4c6d96f AMQ-6055: fix for earlier change to plain response encoding 2015-11-20 18:19:27 +00:00
Robert Gemmell
ce5628a389 AMQ-6055: uptest test client and add [currently-ignored] test to demonstrate the issue 2015-11-20 17:55:41 +00:00
Timothy Bish
d730e35f9d This closes #158 2015-11-19 13:14:26 -05:00
Romain Manni-Bucau
934f3cea7e release the connection even if broker communication fails 2015-11-19 07:48:56 -08:00
Claus Ibsen
cf5735320f Use the new 3.2.2 relese of commons-collections to fix its security issues. 2015-11-19 12:25:07 +01:00
gtully
64aac4ce73 org.apache.activemq.network.VirtualConsumerDemandTest can take more than 10mins - increasing the fork limit 2015-11-18 16:08:29 +00:00