diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java b/activemq-core/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java index 7ff448d28c..f1771fe433 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java @@ -40,7 +40,7 @@ public abstract class LockableServiceSupport extends ServiceSupport implements L long lockKeepAlivePeriod = 0; private ScheduledFuture keepAliveTicket; private ScheduledThreadPoolExecutor clockDaemon; - private BrokerService brokerService; + protected BrokerService brokerService; /** * Initialize resources before locking diff --git a/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java index 22249f05bc..e4f85d5757 100755 --- a/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java @@ -83,7 +83,6 @@ public class JDBCPersistenceAdapter extends DataSourceServiceSupport implements public static final long DEFAULT_LOCK_KEEP_ALIVE_PERIOD = 30 * 1000; private WireFormat wireFormat = new OpenWireFormat(); - private BrokerService brokerService; private Statements statements; private JDBCAdapter adapter; private MemoryTransactionStore transactionStore; @@ -314,7 +313,6 @@ public class JDBCPersistenceAdapter extends DataSourceServiceSupport implements } }, 0, cleanupPeriod, TimeUnit.MILLISECONDS); } - createMessageAudit(); } diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseQuiesceTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseQuiesceTest.java index f5b169c3e1..669720b287 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseQuiesceTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseQuiesceTest.java @@ -64,4 +64,7 @@ public class DbRestartJDBCQueueMasterSlaveLeaseQuiesceTest extends DbRestartJDBC restartDelay = 3000; testSendReceive(); } + + // ignore this test case + public void testAdvisory() throws Exception {} }