[hornetq-commits] JBoss hornetq SVN: r10651 - in branches/Branch_2_2_EAP: tests/src/org/hornetq/tests/unit/core/paging/impl and 1 other directory.

Author: clebert.suconic(a)jboss.com Date: 2011-05-13 01:35:39 -0400 (Fri, 13 May 2011) New Revision: 10651 Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java Log: JBPAPP-6466 - small tweaks only Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java 2011-05-13 05:14:47 UTC (rev 10650) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java 2011-05-13 05:35:39 UTC (rev 10651) @@ -106,12 +106,11 @@ syncTimeout, pagingManager, storageManager, - postOffice, null, this, address, settings, - executorFactory, + executorFactory.getExecutor(), syncNonTransactional); } @@ -212,12 +211,11 @@ syncTimeout, pagingManager, storageManager, - postOffice, factory, this, address, settings, - executorFactory, + executorFactory.getExecutor(), syncNonTransactional); storesReturn.add(store); Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2011-05-13 05:14:47 UTC (rev 10650) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2011-05-13 05:35:39 UTC (rev 10651) @@ -81,8 +81,6 @@ private final StorageManager storageManager; - private final PostOffice postOffice; - private final DecimalFormat format = new DecimalFormat("000000000"); private final AtomicInteger currentPageSize = new AtomicInteger(0); @@ -149,12 +147,11 @@ final long syncTimeout, final PagingManager pagingManager, final StorageManager storageManager, - final PostOffice postOffice, final SequentialFileFactory fileFactory, final PagingStoreFactory storeFactory, final SimpleString storeName, final AddressSettings addressSettings, - final ExecutorFactory executorFactory, + final Executor executor, final boolean syncNonTransactional) { if (pagingManager == null) @@ -166,8 +163,6 @@ this.storageManager = storageManager; - this.postOffice = postOffice; - this.storeName = storeName; applySetting(addressSettings); @@ -182,7 +177,7 @@ pageSize); } - this.executor = executorFactory.getExecutor(); + this.executor = executor; this.pagingManager = pagingManager; Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2011-05-13 05:14:47 UTC (rev 10650) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2011-05-13 05:35:39 UTC (rev 10651) @@ -143,12 +143,11 @@ 100, createMockManager(), createStorageManagerMock(), - createPostOfficeMock(), factory, null, PagingStoreImplTest.destinationTestName, addressSettings, - getExecutorFactory(), + getExecutorFactory().getExecutor(), true); storeImpl.start(); @@ -181,12 +180,11 @@ 100, createMockManager(), createStorageManagerMock(), - createPostOfficeMock(), factory, storeFactory, PagingStoreImplTest.destinationTestName, addressSettings, - getExecutorFactory(), + getExecutorFactory().getExecutor(), true); storeImpl.start(); @@ -219,12 +217,11 @@ 100, createMockManager(), createStorageManagerMock(), - createPostOfficeMock(), factory, null, PagingStoreImplTest.destinationTestName, addressSettings, - getExecutorFactory(), + getExecutorFactory().getExecutor(), true); storeImpl.start(); @@ -248,12 +245,11 @@ 100, createMockManager(), createStorageManagerMock(), - createPostOfficeMock(), factory, storeFactory, PagingStoreImplTest.destinationTestName, addressSettings, - getExecutorFactory(), + getExecutorFactory().getExecutor(), true); storeImpl.start(); @@ -325,12 +321,11 @@ 100, createMockManager(), createStorageManagerMock(), - createPostOfficeMock(), factory, storeFactory, PagingStoreImplTest.destinationTestName, addressSettings, - getExecutorFactory(), + getExecutorFactory().getExecutor(), true); storeImpl.start(); @@ -474,12 +469,11 @@ 100, createMockManager(), createStorageManagerMock(), - createPostOfficeMock(), factory, storeFactory, new SimpleString("test"), settings, - getExecutorFactory(), + getExecutorFactory().getExecutor(), true); storeImpl.start(); @@ -639,12 +633,11 @@ 100, createMockManager(), createStorageManagerMock(), - createPostOfficeMock(), factory, storeFactory, new SimpleString("test"), settings, - getExecutorFactory(), + getExecutorFactory().getExecutor(), true); storeImpl2.start(); @@ -726,12 +719,11 @@ 100, createMockManager(), createStorageManagerMock(), - createPostOfficeMock(), factory, storeFactory, new SimpleString("test"), settings, - getExecutorFactory(), + getExecutorFactory().getExecutor(), true); storeImpl.start(); @@ -770,12 +762,11 @@ 100, createMockManager(), createStorageManagerMock(), - createPostOfficeMock(), factory, storeFactory, new SimpleString("test"), settings, - getExecutorFactory(), + getExecutorFactory().getExecutor(), false); storeImpl.start();