You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/07/16 04:40:21 UTC
[1/2] activemq-artemis git commit: openwire tests: Fix some NPEs and
Index out of boundary errors
Repository: activemq-artemis
Updated Branches:
refs/heads/master d560aa4c4 -> 94f84c43a
openwire tests: Fix some NPEs and Index out of boundary errors
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/74600b2a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/74600b2a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/74600b2a
Branch: refs/heads/master
Commit: 74600b2a53fab4aa811109b02d6e5b612dc869da
Parents: d560aa4
Author: Howard Gao <hg...@redhat.com>
Authored: Thu Jul 16 09:16:25 2015 +0800
Committer: Howard Gao <hg...@redhat.com>
Committed: Thu Jul 16 09:16:25 2015 +0800
----------------------------------------------------------------------
.../apache/activemq/broker/BrokerService.java | 22 +-
.../activemq/broker/FakeTransportConnector.java | 29 ++
.../org/apache/activemq/usage/SystemUsage.java | 284 +++++++++++++++++++
3 files changed, 332 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/74600b2a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
index 75eff1f..f2b5b30 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -89,9 +89,12 @@ public class BrokerService implements Service
private Throwable startException = null;
private boolean startAsync = false;
public Set<Integer> extraConnectors = new HashSet<Integer>();
+
+ private final List<TransportConnector> transportConnectors = new ArrayList<TransportConnector>();
private File dataDirectoryFile;
private PolicyMap destinationPolicy;
+ private SystemUsage systemUsage;
static
{
@@ -340,7 +343,7 @@ public class BrokerService implements Service
public List<TransportConnector> getTransportConnectors()
{
- return new ArrayList<>();
+ return transportConnectors;
}
public TransportConnector addConnector(String bindAddress) throws Exception
@@ -406,7 +409,11 @@ public class BrokerService implements Service
public SystemUsage getSystemUsage()
{
- return null;
+ if (systemUsage == null)
+ {
+ systemUsage = new SystemUsage();
+ }
+ return systemUsage;
}
public synchronized PListStore getTempDataStore()
@@ -460,6 +467,7 @@ public class BrokerService implements Service
public void setSystemUsage(SystemUsage memoryManager)
{
+ this.systemUsage = memoryManager;
}
public void setManagementContext(ManagementContext managementContext)
@@ -568,11 +576,19 @@ public class BrokerService implements Service
public TransportConnector addConnector(URI bindAddress) throws Exception
{
Integer port = bindAddress.getPort();
+ FakeTransportConnector connector = null;
if (port != 0)
{
+ connector = new FakeTransportConnector(bindAddress);
+ this.transportConnectors.add(connector);
this.extraConnectors.add(port);
}
- return null;
+ else
+ {
+ connector = new FakeTransportConnector(new URI(this.getDefaultUri()));
+ this.transportConnectors.add(connector);
+ }
+ return connector;
}
public void setCacheTempDestinations(boolean cacheTempDestinations)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/74600b2a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/FakeTransportConnector.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/FakeTransportConnector.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/FakeTransportConnector.java
new file mode 100644
index 0000000..4d4ab00
--- /dev/null
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/FakeTransportConnector.java
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.broker;
+
+
+import java.net.URI;
+
+public class FakeTransportConnector extends TransportConnector
+{
+ public FakeTransportConnector(URI uri)
+ {
+ super();
+ this.setUri(uri);
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/74600b2a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/usage/SystemUsage.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/usage/SystemUsage.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/usage/SystemUsage.java
new file mode 100644
index 0000000..5086dae
--- /dev/null
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/usage/SystemUsage.java
@@ -0,0 +1,284 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.usage;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ThreadPoolExecutor;
+
+import org.apache.activemq.Service;
+import org.apache.activemq.broker.scheduler.JobSchedulerStore;
+import org.apache.activemq.store.PListStore;
+import org.apache.activemq.store.PersistenceAdapter;
+
+//fake
+public class SystemUsage implements Service {
+
+ private SystemUsage parent;
+ private String name;
+ private MemoryUsage memoryUsage;
+ private StoreUsage storeUsage;
+ private TempUsage tempUsage;
+ private ThreadPoolExecutor executor;
+ private JobSchedulerUsage jobSchedulerUsage;
+ private String checkLimitsLogLevel = "warn";
+
+ /**
+ * True if someone called setSendFailIfNoSpace() on this particular usage
+ * manager
+ */
+ private boolean sendFailIfNoSpaceExplicitySet;
+ private boolean sendFailIfNoSpace;
+ private boolean sendFailIfNoSpaceAfterTimeoutExplicitySet;
+ private long sendFailIfNoSpaceAfterTimeout = 0;
+
+ private final List<SystemUsage> children = new CopyOnWriteArrayList<SystemUsage>();
+
+ public SystemUsage() {
+ this("default", null, null, null);
+ }
+
+ public SystemUsage(String name, PersistenceAdapter adapter, PListStore tempStore, JobSchedulerStore jobSchedulerStore) {
+ this.parent = null;
+ this.name = name;
+ this.memoryUsage = new MemoryUsage(name + ":memory");
+ this.storeUsage = new StoreUsage(name + ":store", adapter);
+ this.tempUsage = new TempUsage(name + ":temp", tempStore);
+ this.jobSchedulerUsage = new JobSchedulerUsage(name + ":jobScheduler", jobSchedulerStore);
+ this.memoryUsage.setExecutor(getExecutor());
+ this.storeUsage.setExecutor(getExecutor());
+ this.tempUsage.setExecutor(getExecutor());
+ }
+
+ public SystemUsage(SystemUsage parent, String name) {
+ this.parent = parent;
+ this.executor = parent.getExecutor();
+ this.name = name;
+ this.memoryUsage = new MemoryUsage(parent.memoryUsage, name + ":memory");
+ this.storeUsage = new StoreUsage(parent.storeUsage, name + ":store");
+ this.tempUsage = new TempUsage(parent.tempUsage, name + ":temp");
+ this.jobSchedulerUsage = new JobSchedulerUsage(parent.jobSchedulerUsage, name + ":jobScheduler");
+ this.memoryUsage.setExecutor(getExecutor());
+ this.storeUsage.setExecutor(getExecutor());
+ this.tempUsage.setExecutor(getExecutor());
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return the memoryUsage
+ */
+ public MemoryUsage getMemoryUsage() {
+ return this.memoryUsage;
+ }
+
+ /**
+ * @return the storeUsage
+ */
+ public StoreUsage getStoreUsage() {
+ return this.storeUsage;
+ }
+
+ /**
+ * @return the tempDiskUsage
+ */
+ public TempUsage getTempUsage() {
+ return this.tempUsage;
+ }
+
+ /**
+ * @return the schedulerUsage
+ */
+ public JobSchedulerUsage getJobSchedulerUsage() {
+ return this.jobSchedulerUsage;
+ }
+
+ @Override
+ public String toString() {
+ return "UsageManager(" + getName() + ")";
+ }
+
+ @Override
+ public void start() {
+ if (parent != null) {
+ parent.addChild(this);
+ }
+ this.memoryUsage.start();
+ this.storeUsage.start();
+ this.tempUsage.start();
+ this.jobSchedulerUsage.start();
+ }
+
+ @Override
+ public void stop() {
+ if (parent != null) {
+ parent.removeChild(this);
+ }
+ this.memoryUsage.stop();
+ this.storeUsage.stop();
+ this.tempUsage.stop();
+ this.jobSchedulerUsage.stop();
+ }
+
+ public void setSendFailIfNoSpace(boolean failProducerIfNoSpace) {
+ sendFailIfNoSpaceExplicitySet = true;
+ this.sendFailIfNoSpace = failProducerIfNoSpace;
+ }
+
+ public boolean isSendFailIfNoSpace() {
+ if (sendFailIfNoSpaceExplicitySet || parent == null) {
+ return sendFailIfNoSpace;
+ } else {
+ return parent.isSendFailIfNoSpace();
+ }
+ }
+
+ private void addChild(SystemUsage child) {
+ children.add(child);
+ }
+
+ private void removeChild(SystemUsage child) {
+ children.remove(child);
+ }
+
+ public SystemUsage getParent() {
+ return parent;
+ }
+
+ public void setParent(SystemUsage parent) {
+ this.parent = parent;
+ }
+
+ public boolean isSendFailIfNoSpaceExplicitySet() {
+ return sendFailIfNoSpaceExplicitySet;
+ }
+
+ public void setSendFailIfNoSpaceExplicitySet(boolean sendFailIfNoSpaceExplicitySet) {
+ this.sendFailIfNoSpaceExplicitySet = sendFailIfNoSpaceExplicitySet;
+ }
+
+ public long getSendFailIfNoSpaceAfterTimeout() {
+ if (sendFailIfNoSpaceAfterTimeoutExplicitySet || parent == null) {
+ return sendFailIfNoSpaceAfterTimeout;
+ } else {
+ return parent.getSendFailIfNoSpaceAfterTimeout();
+ }
+ }
+
+ public void setSendFailIfNoSpaceAfterTimeout(long sendFailIfNoSpaceAfterTimeout) {
+ this.sendFailIfNoSpaceAfterTimeoutExplicitySet = true;
+ this.sendFailIfNoSpaceAfterTimeout = sendFailIfNoSpaceAfterTimeout;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ this.memoryUsage.setName(name + ":memory");
+ this.storeUsage.setName(name + ":store");
+ this.tempUsage.setName(name + ":temp");
+ this.jobSchedulerUsage.setName(name + ":jobScheduler");
+ }
+
+ public void setMemoryUsage(MemoryUsage memoryUsage) {
+ if (memoryUsage.getName() == null) {
+ memoryUsage.setName(this.memoryUsage.getName());
+ }
+ if (parent != null) {
+ memoryUsage.setParent(parent.memoryUsage);
+ }
+ this.memoryUsage = memoryUsage;
+ this.memoryUsage.setExecutor(getExecutor());
+ }
+
+ public void setStoreUsage(StoreUsage storeUsage) {
+ if (storeUsage.getStore() == null) {
+ storeUsage.setStore(this.storeUsage.getStore());
+ }
+ if (storeUsage.getName() == null) {
+ storeUsage.setName(this.storeUsage.getName());
+ }
+ if (parent != null) {
+ storeUsage.setParent(parent.storeUsage);
+ }
+ this.storeUsage = storeUsage;
+ this.storeUsage.setExecutor(executor);
+ }
+
+ public void setTempUsage(TempUsage tempDiskUsage) {
+ if (tempDiskUsage.getStore() == null) {
+ tempDiskUsage.setStore(this.tempUsage.getStore());
+ }
+ if (tempDiskUsage.getName() == null) {
+ tempDiskUsage.setName(this.tempUsage.getName());
+ }
+ if (parent != null) {
+ tempDiskUsage.setParent(parent.tempUsage);
+ }
+ this.tempUsage = tempDiskUsage;
+ this.tempUsage.setExecutor(getExecutor());
+ }
+
+ public void setJobSchedulerUsage(JobSchedulerUsage jobSchedulerUsage) {
+ if (jobSchedulerUsage.getStore() == null) {
+ jobSchedulerUsage.setStore(this.jobSchedulerUsage.getStore());
+ }
+ if (jobSchedulerUsage.getName() == null) {
+ jobSchedulerUsage.setName(this.jobSchedulerUsage.getName());
+ }
+ if (parent != null) {
+ jobSchedulerUsage.setParent(parent.jobSchedulerUsage);
+ }
+ this.jobSchedulerUsage = jobSchedulerUsage;
+ this.jobSchedulerUsage.setExecutor(getExecutor());
+ }
+
+ /**
+ * @return the executor
+ */
+ public ThreadPoolExecutor getExecutor() {
+ return this.executor;
+ }
+
+ /**
+ * @param executor
+ * the executor to set
+ */
+ public void setExecutor(ThreadPoolExecutor executor) {
+ this.executor = executor;
+ if (this.memoryUsage != null) {
+ this.memoryUsage.setExecutor(this.executor);
+ }
+ if (this.storeUsage != null) {
+ this.storeUsage.setExecutor(this.executor);
+ }
+ if (this.tempUsage != null) {
+ this.tempUsage.setExecutor(this.executor);
+ }
+ if(this.jobSchedulerUsage != null) {
+ this.jobSchedulerUsage.setExecutor(this.executor);
+ }
+ }
+
+ public String getCheckLimitsLogLevel() {
+ return checkLimitsLogLevel;
+ }
+
+ public void setCheckLimitsLogLevel(String checkLimitsLogLevel) {
+ this.checkLimitsLogLevel = checkLimitsLogLevel;
+ }
+}
[2/2] activemq-artemis git commit: This closes #83 OpenWire fixes
Posted by cl...@apache.org.
This closes #83 OpenWire fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/94f84c43
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/94f84c43
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/94f84c43
Branch: refs/heads/master
Commit: 94f84c43aa06d2189da5be8c99f4ec331a7f49a2
Parents: d560aa4 74600b2
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Jul 15 22:40:00 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jul 15 22:40:00 2015 -0400
----------------------------------------------------------------------
.../apache/activemq/broker/BrokerService.java | 22 +-
.../activemq/broker/FakeTransportConnector.java | 29 ++
.../org/apache/activemq/usage/SystemUsage.java | 284 +++++++++++++++++++
3 files changed, 332 insertions(+), 3 deletions(-)
----------------------------------------------------------------------