[1/2] activemq-artemis git commit: This closes #1850

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[1/2] activemq-artemis git commit: This closes #1850

jbertram
Repository: activemq-artemis
Updated Branches:
  refs/heads/master eada73e5d -> 116b06afd


This closes #1850


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/116b06af
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/116b06af
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/116b06af

Branch: refs/heads/master
Commit: 116b06afd4dfed8ee3f490d7dcd350475def9188
Parents: eada73e 5dc0777
Author: Justin Bertram <[hidden email]>
Authored: Mon Feb 12 09:37:56 2018 -0600
Committer: Justin Bertram <[hidden email]>
Committed: Mon Feb 12 09:37:56 2018 -0600

----------------------------------------------------------------------
 .../activemq/artemis/core/replication/ReplicationEndpoint.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


Reply | Threaded
Open this post in threaded view
|

[2/2] activemq-artemis git commit: ARTEMIS-1667 init pagingFactory with journalBufferTimeout_NIO

jbertram
ARTEMIS-1667 init pagingFactory with journalBufferTimeout_NIO


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5dc0777f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5dc0777f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5dc0777f

Branch: refs/heads/master
Commit: 5dc0777f52a4d2e388f569bdedd6a7f0d40697f5
Parents: eada73e
Author: yang wei <[hidden email]>
Authored: Mon Feb 5 16:42:23 2018 +0800
Committer: Justin Bertram <[hidden email]>
Committed: Mon Feb 12 09:37:56 2018 -0600

----------------------------------------------------------------------
 .../activemq/artemis/core/replication/ReplicationEndpoint.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5dc0777f/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
index 4d81613..f76f796 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
@@ -262,7 +262,7 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon
             journalLoadInformation[jc.typeByte] = journalsHolder.get(jc).loadSyncOnly(JournalState.SYNCING);
          }
 
-         pageManager = new PagingManagerImpl(new PagingStoreFactoryNIO(storageManager, config.getPagingLocation(), config.getJournalBufferSize_NIO(), server.getScheduledPool(), server.getExecutorFactory(), config.isJournalSyncNonTransactional(), criticalErrorListener), server.getAddressSettingsRepository());
+         pageManager = new PagingManagerImpl(new PagingStoreFactoryNIO(storageManager, config.getPagingLocation(), config.getJournalBufferTimeout_NIO(), server.getScheduledPool(), server.getExecutorFactory(), config.isJournalSyncNonTransactional(), criticalErrorListener), server.getAddressSettingsRepository());
 
          pageManager.start();