You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/10/05 15:53:15 UTC
[1/3] activemq-artemis git commit: ARTEMIS-752 fixing NPE
Repository: activemq-artemis
Updated Branches:
refs/heads/master cc6ded96d -> f6f633123
ARTEMIS-752 fixing NPE
Done as a patch on https://issues.apache.org/jira/browse/ARTEMIS-752
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f8038268
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f8038268
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f8038268
Branch: refs/heads/master
Commit: f8038268e0699c7d9726b433cec6aa830df68ec2
Parents: cc6ded9
Author: Benjamin Graf <>
Authored: Wed Oct 5 11:40:07 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Oct 5 11:40:10 2016 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/osgi/OsgiBroker.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f8038268/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java
----------------------------------------------------------------------
diff --git a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java
index e921768..c478096 100644
--- a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java
+++ b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java
@@ -144,11 +144,13 @@ public class OsgiBroker {
private String[] getRequiredProtocols(Set<TransportConfiguration> acceptors) {
ArrayList<String> protocols = new ArrayList<>();
for (TransportConfiguration acceptor : acceptors) {
- String protocolsFromAcceptor = acceptor.getParams().get(TransportConstants.PROTOCOLS_PROP_NAME).toString();
- String[] protocolsSplit = protocolsFromAcceptor.split(",");
- for (String protocol : protocolsSplit) {
- if (!protocol.contains(protocol)) {
- protocols.add(protocol);
+ Object protocolsFromAcceptor = acceptor.getParams().get(TransportConstants.PROTOCOLS_PROP_NAME);
+ if (protocolsFromAcceptor != null) {
+ String[] protocolsSplit = protocolsFromAcceptor.toString().split(",");
+ for (String protocol : protocolsSplit) {
+ if (!protocols.contains(protocol)) {
+ protocols.add(protocol);
+ }
}
}
}
[2/3] activemq-artemis git commit: NO-JIRA: Improving default
configuration from OSGI
Posted by jb...@apache.org.
NO-JIRA: Improving default configuration from OSGI
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d61c13ed
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d61c13ed
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d61c13ed
Branch: refs/heads/master
Commit: d61c13ed77ecad432576442da31398ce77c87eb0
Parents: f803826
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Oct 5 11:40:46 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Oct 5 11:40:46 2016 -0400
----------------------------------------------------------------------
artemis-features/src/main/resources/artemis.xml | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d61c13ed/artemis-features/src/main/resources/artemis.xml
----------------------------------------------------------------------
diff --git a/artemis-features/src/main/resources/artemis.xml b/artemis-features/src/main/resources/artemis.xml
index 99c04a1..3cdff88 100644
--- a/artemis-features/src/main/resources/artemis.xml
+++ b/artemis-features/src/main/resources/artemis.xml
@@ -30,7 +30,7 @@ under the License.
<core xmlns="urn:activemq:core">
<!-- this could be ASYNCIO or NIO -->
- <journal-type>NIO</journal-type>
+ <journal-type>ASYNCIO</journal-type>
<paging-directory>./data/paging</paging-directory>
<bindings-directory>./data/bindings</bindings-directory>
<journal-directory>./data/journal</journal-directory>
@@ -45,10 +45,21 @@ under the License.
-->
<journal-buffer-timeout>1591999</journal-buffer-timeout>
+ <!-- how often we are looking for how many bytes are being used on the disk in ms -->
+ <disk-scan-period>5000</disk-scan-period>
+
+ <!-- once the disk hits this limit the system will block, or close the connection in certain protocols
+ that won't support flow control. -->
+ <max-disk-usage>90</max-disk-usage>
+
+ <!-- the system will enter into page mode once you hit this limit.
+ This is an estimate in bytes of how much the messages are using in memory -->
+ <global-max-size>104857600</global-max-size>
+
<acceptors>
<!-- Default ActiveMQ Artemis Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP. -->
<!-- performance tests have shown that openWire performs best with these buffer sizes -->
- <acceptor name="artemis">tcp://0.0.0.0:61616?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576</acceptor>
+ <acceptor name="artemis">tcp://0.0.0.0:61616?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576;protocols=XXXX</acceptor>
<!-- AMQP Acceptor. Listens on default AMQP port for AMQP traffic.-->
<acceptor name="amqp">tcp://0.0.0.0:5672?protocols=AMQP</acceptor>
@@ -82,9 +93,10 @@ under the License.
<dead-letter-address>jms.queue.DLQ</dead-letter-address>
<expiry-address>jms.queue.ExpiryQueue</expiry-address>
<redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
+ <!-- with -1 only the global-max-size is in use for limiting -->
+ <max-size-bytes>-1</max-size-bytes>
<message-counter-history-day-limit>10</message-counter-history-day-limit>
- <address-full-policy>BLOCK</address-full-policy>
+ <address-full-policy>PAGE</address-full-policy>
<auto-create-jms-queues>true</auto-create-jms-queues>
</address-setting>
</address-settings>
[3/3] activemq-artemis git commit: This closes #819
Posted by jb...@apache.org.
This closes #819
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f6f63312
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f6f63312
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f6f63312
Branch: refs/heads/master
Commit: f6f633123dcb7d8ca362a0a7b9e4dde8a06388a0
Parents: cc6ded9 d61c13e
Author: jbertram <jb...@apache.com>
Authored: Wed Oct 5 10:53:01 2016 -0500
Committer: jbertram <jb...@apache.com>
Committed: Wed Oct 5 10:53:01 2016 -0500
----------------------------------------------------------------------
artemis-features/src/main/resources/artemis.xml | 20 ++++++++++++++++----
.../activemq/artemis/osgi/OsgiBroker.java | 12 +++++++-----
2 files changed, 23 insertions(+), 9 deletions(-)
----------------------------------------------------------------------