[jboss-cvs] JBoss Messaging SVN: r5448 - in trunk: src/main/org/jboss/messaging/core/postoffice/impl and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 2 05:39:19 EST 2008
Author: ataylor
Date: 2008-12-02 05:39:19 -0500 (Tue, 02 Dec 2008)
New Revision: 5448
Modified:
trunk/src/main/org/jboss/messaging/core/postoffice/PostOffice.java
trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeImplTest.java
Log:
moved expiry runner into post office
Modified: trunk/src/main/org/jboss/messaging/core/postoffice/PostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/PostOffice.java 2008-12-02 09:51:36 UTC (rev 5447)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/PostOffice.java 2008-12-02 10:39:19 UTC (rev 5448)
@@ -78,8 +78,6 @@
Set<SimpleString> listAllDestinations();
List<Queue> activate();
-
- List<Queue> getQueues();
PagingManager getPagingManager();
Modified: trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java 2008-12-02 09:51:36 UTC (rev 5447)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java 2008-12-02 10:39:19 UTC (rev 5448)
@@ -29,6 +29,8 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.filter.Filter;
@@ -47,15 +49,16 @@
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.impl.SendLockImpl;
import org.jboss.messaging.core.transaction.ResourceManager;
+import org.jboss.messaging.core.settings.impl.QueueSettings;
+import org.jboss.messaging.core.settings.HierarchicalRepository;
import org.jboss.messaging.util.SimpleString;
+import org.jboss.messaging.util.JBMThreadFactory;
/**
- *
* A PostOfficeImpl
- *
+ *
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
* @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
- *
*/
public class PostOfficeImpl implements PostOffice
{
@@ -81,10 +84,21 @@
private Map<SimpleString, SendLock> addressLocks = new HashMap<SimpleString, SendLock>();
+ private ScheduledThreadPoolExecutor messageExpiryExecutor;
+
+ private final HierarchicalRepository<QueueSettings> queueSettingsRepository;
+
+ private final long messageExpiryScanPeriod;
+
+ private final int messageExpiryThreadPriority;
+
public PostOfficeImpl(final StorageManager storageManager,
final PagingManager pagingManager,
final QueueFactory queueFactory,
final ManagementService managementService,
+ final HierarchicalRepository<QueueSettings> queueSettingsRepository,
+ final long messageExpiryScanPeriod,
+ final int messageExpiryThreadPriority,
final boolean checkAllowable,
final ResourceManager resourceManager,
final boolean enableWildCardRouting,
@@ -102,6 +116,12 @@
this.resourceManager = resourceManager;
+ this.queueSettingsRepository = queueSettingsRepository;
+
+ this.messageExpiryScanPeriod = messageExpiryScanPeriod;
+
+ this.messageExpiryThreadPriority = messageExpiryThreadPriority;
+
if (enableWildCardRouting)
{
addressManager = new WildcardAddressManager();
@@ -130,11 +150,28 @@
loadBindings();
+ if (messageExpiryScanPeriod > 0)
+ {
+ MessageExpiryRunner messageExpiryRunner = new MessageExpiryRunner();
+ messageExpiryRunner.setPriority(3);
+ messageExpiryExecutor = new ScheduledThreadPoolExecutor(1,
+ new JBMThreadFactory("JBM-scheduled-threads",
+ messageExpiryThreadPriority));
+ messageExpiryExecutor.scheduleAtFixedRate(messageExpiryRunner,
+ messageExpiryScanPeriod,
+ messageExpiryScanPeriod,
+ TimeUnit.MILLISECONDS);
+ }
started = true;
}
public void stop() throws Exception
{
+ if(messageExpiryExecutor != null)
+ {
+ messageExpiryExecutor.shutdown();
+ }
+
pagingManager.stop();
addressManager.clear();
@@ -218,14 +255,14 @@
final boolean fanout) throws Exception
{
Binding binding = createBinding(address, queueName, filter, durable, temporary, fanout);
-
+
addBindingInMemory(binding);
if (durable)
{
storageManager.addBinding(binding);
}
-
+
pagingManager.createPageStore(address);
return binding;
@@ -292,9 +329,9 @@
if (bindings != null)
{
Binding theBinding = null;
-
+
long lowestRoutings = -1;
-
+
for (Binding binding : bindings)
{
Queue queue = binding.getQueue();
@@ -316,23 +353,23 @@
//This gives us a weighted round robin, where the weight
//Can be determined from the number of consumers on the queue
long routings = binding.getRoutings();
-
+
if (routings < lowestRoutings || lowestRoutings == -1)
- {
+ {
lowestRoutings = routings;
-
+
theBinding = binding;
}
}
}
}
-
+
if (theBinding != null)
- {
+ {
MessageReference reference = message.createReference(theBinding.getQueue());
refs.add(reference);
-
+
theBinding.incrementRoutings();
}
@@ -375,21 +412,6 @@
return queues;
}
- public List<Queue> getQueues()
- {
- Map<SimpleString, Binding> nameMap = addressManager.getBindings();
-
- List<Queue> queues = new ArrayList<Queue>();
-
- for (Binding binding : nameMap.values())
- {
- Queue queue = binding.getQueue();
- queues.add(queue);
- }
-
- return queues;
- }
-
public synchronized SendLock getAddressLock(final SimpleString address)
{
SendLock lock = addressLocks.get(address);
@@ -410,7 +432,7 @@
final SimpleString name,
final Filter filter,
final boolean durable,
- final boolean temporary,
+ final boolean temporary,
final boolean fanout) throws Exception
{
Queue queue = queueFactory.createQueue(-1, name, filter, durable, false);
@@ -474,32 +496,32 @@
queues.put(binding.getQueue().getPersistenceID(), binding.getQueue());
}
// TODO: This is related to http://www.jboss.com/index.html?module=bb&op=viewtopic&t=145597
-
+
//FIXME This is incorrect - you cannot assume there is an allowable address in existence
//for every address in the post office.
//This code is unnecessary if paging stores are loaded lazily
HashSet<SimpleString> addresses = new HashSet<SimpleString>();
-
- for (Binding binding: bindings)
+
+ for (Binding binding : bindings)
{
addresses.add(binding.getAddress());
}
-
- for (SimpleString destination: dests)
+
+ for (SimpleString destination : dests)
{
addresses.add(destination);
}
-
+
for (SimpleString destination : addresses)
{
pagingManager.createPageStore(destination);
}
-
+
// End TODO -------------------------------------
storageManager.loadMessages(this, queues, resourceManager);
-
+
for (SimpleString destination : addresses)
{
PagingStore store = pagingManager.getPageStore(destination);
@@ -516,4 +538,32 @@
}
}
}
+
+
+ private class MessageExpiryRunner extends Thread
+ {
+ public void run()
+ {
+ Map<SimpleString, Binding> nameMap = addressManager.getBindings();
+
+ List<Queue> queues = new ArrayList<Queue>();
+
+ for (Binding binding : nameMap.values())
+ {
+ Queue queue = binding.getQueue();
+ queues.add(queue);
+ }
+ for (Queue queue : queues)
+ {
+ try
+ {
+ queue.expireMessages(storageManager, PostOfficeImpl.this, queueSettingsRepository);
+ }
+ catch (Exception e)
+ {
+ log.error("failed to expire messages for queue " + queue.getName(), e);
+ }
+ }
+ }
+ }
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-12-02 09:51:36 UTC (rev 5447)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-12-02 10:39:19 UTC (rev 5448)
@@ -136,8 +136,8 @@
private ManagementService managementService;
- private ScheduledThreadPoolExecutor messageExpiryExecutor;
+
// Constructors
// ---------------------------------------------------------------------------------
@@ -227,6 +227,9 @@
pagingManager,
queueFactory,
managementService,
+ queueSettingsRepository,
+ configuration.getMessageExpiryScanPeriod(),
+ configuration.getMessageExpiryThreadPriority(),
configuration.isRequireDestinations(),
resourceManager,
configuration.isWildcardRoutingEnabled(),
@@ -245,15 +248,7 @@
this);
postOffice.start();
- MessageExpiryRunner messageExpiryRunner = new MessageExpiryRunner(postOffice);
- messageExpiryRunner.setPriority(3);
- messageExpiryExecutor = new ScheduledThreadPoolExecutor(1,
- new JBMThreadFactory("JBM-scheduled-threads",
- configuration.getMessageExpiryThreadPriority()));
- messageExpiryExecutor.scheduleAtFixedRate(messageExpiryRunner,
- configuration.getMessageExpiryScanPeriod(),
- configuration.getMessageExpiryScanPeriod(),
- TimeUnit.MILLISECONDS);
+
resourceManager.start();
// FIXME the destination corresponding to the notification address is always created
@@ -340,7 +335,6 @@
securityStore = null;
resourceManager.stop();
resourceManager = null;
- messageExpiryExecutor.shutdown();
postOffice.stop();
postOffice = null;
securityRepository = null;
@@ -756,32 +750,6 @@
}
}
- private class MessageExpiryRunner extends Thread
- {
- private final PostOffice postOffice;
-
- public MessageExpiryRunner(PostOffice postOffice)
- {
- this.postOffice = postOffice;
- }
-
- public void run()
- {
- List<Queue> queues = postOffice.getQueues();
- for (Queue queue : queues)
- {
- try
- {
- queue.expireMessages(storageManager, postOffice, queueSettingsRepository);
- }
- catch (Exception e)
- {
- log.error("failed to expire messages for queue " + queue.getName(), e);
- }
- }
- }
- }
-
private static class NoCacheConnectionLifeCycleListener implements ConnectionLifeCycleListener
{
private RemotingConnection conn;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java 2008-12-02 09:51:36 UTC (rev 5447)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java 2008-12-02 10:39:19 UTC (rev 5448)
@@ -42,6 +42,7 @@
import org.jboss.messaging.core.transaction.impl.TransactionImpl;
import org.jboss.messaging.util.ConcurrentHashSet;
import org.jboss.messaging.util.SimpleString;
+import org.jboss.messaging.util.ConcurrentSet;
/**
* Implementation of a Queue TODO use Java 5 concurrent queue
@@ -75,7 +76,7 @@
private final PriorityLinkedList<MessageReference> messageReferences = new PriorityLinkedListImpl<MessageReference>(NUM_PRIORITIES);
- private final ConcurrentHashSet<MessageReference> expiringMessageReferences = new ConcurrentHashSet<MessageReference>();
+ private final ConcurrentSet<MessageReference> expiringMessageReferences = new ConcurrentHashSet<MessageReference>();
private final ScheduledDeliveryHandler scheduledDeliveryHandler;
@@ -187,10 +188,6 @@
{
messageReferences.addFirst(ref, msg.getPriority());
}
- if (ref.getMessage().getExpiration() != 0)
- {
- expiringMessageReferences.addIfAbsent(ref);
- }
}
deliver();
@@ -520,22 +517,13 @@
final PostOffice postOffice,
final HierarchicalRepository<QueueSettings> queueSettingsRepository) throws Exception
{
- List<MessageReference> refs = new ArrayList<MessageReference>();
-
for (MessageReference expiringMessageReference : expiringMessageReferences)
{
if (expiringMessageReference.getMessage().isExpired())
{
- refs.add(expiringMessageReference);
+ expireMessage(expiringMessageReference.getMessage().getMessageID(), storageManager, postOffice, queueSettingsRepository);
}
}
- for (MessageReference ref : refs)
- {
- if (expiringMessageReferences.remove(ref))
- {
- expireMessage(ref.getMessage().getMessageID(), storageManager, postOffice, queueSettingsRepository);
- }
- }
}
public boolean sendMessageToDeadLetterAddress(final long messageID,
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeImplTest.java 2008-12-02 09:51:36 UTC (rev 5447)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeImplTest.java 2008-12-02 10:39:19 UTC (rev 5448)
@@ -68,7 +68,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -89,7 +89,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -125,7 +125,7 @@
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
EasyMock.expect(pgm.isGlobalPageMode()).andStubReturn(true);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -174,7 +174,7 @@
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
EasyMock.expect(pgm.isGlobalPageMode()).andStubReturn(true);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -221,7 +221,7 @@
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -272,7 +272,7 @@
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
EasyMock.expect(pgm.isGlobalPageMode()).andStubReturn(true);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -320,7 +320,7 @@
EasyMock.expect(pgm.getPageStore(address1)).andStubReturn(store);
EasyMock.expect(pgm.createPageStore(address1)).andStubReturn(store);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -356,7 +356,7 @@
PagingStore pgstore = EasyMock.createNiceMock(PagingStore.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -420,7 +420,7 @@
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
PagingStore pgstore = EasyMock.createNiceMock(PagingStore.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -481,7 +481,7 @@
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
PagingStore pgstore = EasyMock.createNiceMock(PagingStore.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -538,7 +538,7 @@
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
PagingStore pgstore = EasyMock.createNiceMock(PagingStore.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -597,7 +597,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice po = new PostOfficeImpl(pm, pgm, qf, ms, false, null, wildCardRoutingEnabled, false);
+ PostOffice po = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, false, null, wildCardRoutingEnabled, false);
final long id = 324;
final SimpleString name = new SimpleString("wibb22");
@@ -639,7 +639,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice po = new PostOfficeImpl(pm, pgm, qf, ms, false, null, wildCardRoutingEnabled, false);
+ PostOffice po = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, false, null, wildCardRoutingEnabled, false);
final long id = 324;
final SimpleString name = new SimpleString("wibb22");
@@ -695,7 +695,7 @@
EasyMock.expect(pgm.createPageStore(EasyMock.isA(SimpleString.class))).andStubReturn(null);
EasyMock.replay(pgm);
- PostOffice po = new PostOfficeImpl(pm, pgm, qf, ms, false, null, wildCardRoutingEnabled, false);
+ PostOffice po = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, false, null, wildCardRoutingEnabled, false);
final SimpleString condition1 = new SimpleString("queue.wibble");
@@ -783,7 +783,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -812,7 +812,7 @@
EasyMock.expect(pgm.createPageStore(EasyMock.isA(SimpleString.class))).andStubReturn(null);
EasyMock.replay(pgm);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -843,7 +843,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -875,7 +875,7 @@
EasyMock.expect(pgm.createPageStore(EasyMock.isA(SimpleString.class))).andStubReturn(null);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -914,7 +914,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -947,7 +947,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -989,7 +989,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -1021,7 +1021,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -1060,7 +1060,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -1099,7 +1099,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -1135,7 +1135,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -1184,7 +1184,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -1218,7 +1218,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -1262,7 +1262,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -1296,7 +1296,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, true, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, true, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -1329,7 +1329,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, false, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, false, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -1358,7 +1358,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, false, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, false, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -1407,7 +1407,7 @@
EasyMock.expect(pgm.addSize(EasyMock.isA(ServerMessage.class))).andReturn(-1l);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, false, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, false, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -1448,7 +1448,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, false, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, false, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -1489,7 +1489,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, false, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, false, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -1533,7 +1533,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, false, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, false, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
@@ -1591,7 +1591,7 @@
ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
PagingManager pgm = EasyMock.createNiceMock(PagingManager.class);
- PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, false, null, wildCardRoutingEnabled, false);
+ PostOffice postOffice = new PostOfficeImpl(pm, pgm, qf, ms, null, -1, -1, false, null, wildCardRoutingEnabled, false);
qf.setPostOffice(postOffice);
More information about the jboss-cvs-commits
mailing list