Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-02-10 03:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,137 Commits 22 Branches 100 Tags
Commit Graph

9137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher L. Shannon (cshannon)
b103932ccd https://issues.apache.org/jira/browse/AMQ-6097 
remove un-needed import statements

(cherry picked from commit 370b1810995c48129521d1c86d7b0a31d1d966d9)
 2015-12-22 13:14:44 +00:00
Christopher L. Shannon (cshannon)
51aa70eaae https://issues.apache.org/jira/browse/AMQ-6097 
Fixing KahaDB so that the correct marshaller is used for the message
keys inside of the message order index.  This will ensure that message
size metrics are accurate.

(cherry picked from commit 246ccb8e04515c6e85544b32035537f60d92b5b9)
 2015-12-22 13:14:44 +00:00
Timothy Bish
871f0a6005 https://issues.apache.org/jira/browse/AMQ-6102 
Call to the statistics instance of the subscription to reset the
counters.
(cherry picked from commit 564d55023ec7386c31277db054ecc63d966e2b29)
 2015-12-21 17:04:47 -05:00
Timothy Bish
7dd2330011 https://issues.apache.org/jira/browse/AMQ-6101 
Update to v0.7.0 of Qpid JMS client libraries.
(cherry picked from commit ddd2812279e2e3f9750317e0a5a35f4187af9e20)
 2015-12-21 12:48:56 -05:00
Christopher L. Shannon (cshannon)
a12c21061e https://issues.apache.org/jira/browse/AMQ-6091 
The JavaRuntimeConfigurationBroker can now apply a subset of policy
properties retrospectively to existing destinations versus applying
all properties of the policy update.

(cherry picked from commit a253ad3c71a07bb4d1883fe84be217af9855cfc6)
 2015-12-18 18:22:19 +00:00
Timothy Bish
5c66343bc9 https://issues.apache.org/jira/browse/AMQ-6096 
Update proton to latest.
(cherry picked from commit 9ee92a1e16408c2174bfe29fe1ba1308821367da)
 2015-12-18 10:38:38 -05: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 b9dcb010f74675f6369f7e74b931b670e0ecab51)
 2015-12-16 14:39:27 +00:00
Christopher L. Shannon (cshannon)
be38e92753 Adding activemq-5.12.2 to spring.schemas 
(cherry picked from commit 09cbfa947772ad859fab49c37a08d1eb8d7ecdaa)
 2015-12-15 15:13:35 +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 eeec0c07b06e6121ed33e20f7c663214538d0da1)
 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 94446e53dc348b9109dff46e92484ed9e6cc1d72)
 2015-12-14 19:12:28 +00:00
Christopher L. Shannon (cshannon)
27b08b03c5 https://issues.apache.org/jira/browse/AMQ-6088 
The runtime plugins will now find the exact policy to update which means
that a destination can match more than one policy and the policy can
still be updated at runtime.

The java runtime broker also supports the ability to replace or add a
policy entry based on a flag on a new method call.

(cherry picked from commit 9e7fae0d83c584f98e99024ba6d20e53f14b81f7)
 2015-12-14 19:09:16 +00:00
gtully
fc4120e850 https://issues.apache.org/jira/browse/AMQ-6086 - test cannot validate all start failures scenarios at this time, suffice that start and stop complete ok 
(cherry picked from commit b7787bf6fbbb33b5d16b34dab07de52b76044a4c)
 2015-12-14 19:09:15 +00:00
gtully
b4360c6e0e https://issues.apache.org/jira/browse/AMQ-6086 - avoid logging npe on attempted start of persistence adapter post stop 
(cherry picked from commit 455a628305dc49476d7033701901d119db3fffdb)
 2015-12-14 19:09:15 +00:00
gtully
2ffd7498a8 https://issues.apache.org/jira/browse/AMQ-6086 - start exception can prevent stop from exiting fully, need to be more selective in creation on stop. 
(cherry picked from commit 35df815fb86d201e63b4f0f2d53bee3bae5c0752)
 2015-12-14 19:09:15 +00:00
Dejan Bosanac
f3aedc753c https://issues.apache.org/jira/browse/AMQ-6077 - test 
(cherry picked from commit 7951037f20e8d6752ab0bbd90189a8276bc61a55)
 2015-12-14 19:09:14 +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 c78eddce7ed3045b5508dd6713252dca8766436c)
 2015-12-11 17:34:35 +00:00
gtully
e5b86116c4 https://issues.apache.org/jira/browse/AMQ-6086 - add some determinism to interleaved stop and start calls on broker service 
(cherry picked from commit da076f4a632af6ad1d66382523f4c50e9de9e62e)
 2015-12-11 17:32:06 +00:00
gtully
aa2a85abe5 https://issues.apache.org/jira/browse/AMQ-6070 - rework regression - KahaDBStoreRecoveryExpiryTest had NPE in the logs, region dest not set on recovery listener for expiry case 
(cherry picked from commit 93092f7ea0e231cd7d615f8ee6420c9b73a5367f)
 2015-12-11 17:31:32 +00:00
gtully
9c82756ca9 https://issues.apache.org/jira/browse/AMQ-6083 - resolve some test regressions - AMQ2149Test - fail to start with missing data file. Ensure ack map is always saved on modification 
(cherry picked from commit 31d99b6aa92aed27acfd90a4d2a278c077a47a33)
 2015-12-11 09:53:22 -05:00
gtully
724a0e85f3 https://issues.apache.org/jira/browse/AMQ-6083 - ignore test scenario on leveldb store 
(cherry picked from commit 8609f74db329d97eac054cca2d1dd188c2960ddd)
 2015-12-11 12:34:36 +00:00
gtully
9e8f020301 https://issues.apache.org/jira/browse/AMQ-6005 - have plist whack it existing state on start. Start the temp store after the primary persistence adapter which does the locking 
(cherry picked from commit 768fa17085ac938441915a82987c99b37ac52515)
 2015-12-10 09:46:17 -05:00
gtully
2be754583c https://issues.apache.org/jira/browse/AMQ-6084 - add broker.adjustUsageLimits to disable the adjustment of limits to what is available. In this way, a broker will fail to start if constrained, ensuring it won't accept connections and block pending resources if it has earlier exited for that reason 
(cherry picked from commit d7febddb6789171ccfd22faf0ee4f00f3e9c9490)
 2015-12-10 09:46:03 -05:00
gtully
99fce5bae9 https://issues.apache.org/jira/browse/AMQ-6083 - ignoreMissingJournalfiles false - check for missing acks and corruption anywhere and error out so that corruption does not go unnoticed - fix and test 
(cherry picked from commit 5db5f3e39a682640b64bc904f30cbd2e0e3de4da)
 2015-12-09 09:20:48 -05:00
gtully
0952866273 with failover the reported exception may be wrapped by the failover listener 
(cherry picked from commit 9c4ef26d5ca27fb789e88980112598a31d178a4f)
 2015-12-09 09:20:36 -05:00
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