Repository: activemq-artemis Updated Branches: refs/heads/master 200fd5c1b -> 9e761ad8e
Fix compilation error Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/447f33d1 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/447f33d1 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/447f33d1 Branch: refs/heads/master Commit: 447f33d19f5c9abdc766cf182a90e3553cd1ce1b Parents: 200fd5c Author: Howard Gao <[email protected]> Authored: Thu Jul 30 19:56:39 2015 +0800 Committer: Howard Gao <[email protected]> Committed: Thu Jul 30 19:57:40 2015 +0800 ---------------------------------------------------------------------- .../apache/activemq/broker/artemiswrapper/ArtemisBrokerBase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/447f33d1/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerBase.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerBase.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerBase.java index 52f1f42..e7e117e 100644 --- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerBase.java +++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerBase.java @@ -26,7 +26,6 @@ import java.util.Set; import java.util.concurrent.ThreadPoolExecutor; import org.apache.activemq.artemis.api.core.TransportConfiguration; -import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; @@ -37,6 +36,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.server.JournalType; import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.jlibaio.LibaioContext; import org.apache.activemq.broker.Broker; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.Connection; @@ -590,7 +590,7 @@ public abstract class ArtemisBrokerBase implements Broker { } protected static JournalType getDefaultJournalType() { - if (AsynchronousFileImpl.isLoaded()) { + if (LibaioContext.isLoaded()) { return JournalType.ASYNCIO; } else { return JournalType.NIO;
