Author: rajdavies
Date: Wed Sep 23 09:21:48 2009
New Revision: 818013
URL: http://svn.apache.org/viewvc?rev=818013&view=rev
Log:
Now memory limits are being set properly for a Destination - have to update the
test
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.java
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.java?rev=818013&r1=818012&r2=818013&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.java
Wed Sep 23 09:21:48 2009
@@ -90,7 +90,8 @@
systemUsage.getMemoryUsage().setLimit(systemLimit);
PolicyEntry policy = new PolicyEntry();
- policy.setMemoryLimit(memoryLimit);
+ policy.setProducerFlowControl(true);
+ policy.setUseCache(true);
PolicyMap pMap = new PolicyMap();
pMap.setDefaultEntry(policy);
broker.setDestinationPolicy(pMap);
@@ -112,13 +113,15 @@
start();
MessageProducer producer = session.createProducer(queue);
producer.setDeliveryMode(deliveryMode);
+ int i =0;
try {
- for (int i = 0; i < 200; i++) {
+ for (i = 0; i < 200; i++) {
TextMessage message =
session.createTextMessage(createMessageText(i));
producer.send(message);
}
} catch (javax.jms.ResourceAllocationException e) {
- fail(e.getMessage() + ". percentUsage = " +
broker.getSystemUsage().getMemoryUsage().getPercentUsage());
+ e.printStackTrace();
+ fail(e.getMessage() + " num msgs = " + i + ". percentUsage = " +
broker.getSystemUsage().getMemoryUsage().getPercentUsage());
}
stop();
}
@@ -130,8 +133,8 @@
}
public void testUseCachePersistent() throws Exception {
- int limit = memoryLimit / 3;
- configureBroker(limit, limit);
+ int limit = memoryLimit / 2;
+ configureBroker(limit, memoryLimit);
sendMessages(DeliveryMode.PERSISTENT);
}