Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #1888

This commit is contained in:
Michael Andre Pearce 2018-02-22 21:37:34 +00:00
parent 43f4a758d6 1e57a8e70a
commit 2994ad2e5d
7 changed files with 8 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
View File

@ -168,11 +168,6 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
// ActivateCallback implementation -------------------------------------
@Override
public void preActivate() {
}
@Override
public synchronized void activated() {
if (!startCalled) {

12
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActivateCallback.java
View File

@ -21,21 +21,25 @@ public interface ActivateCallback {
/*
* this is called before any services are started when the server first initialised
*/
void preActivate();
default void preActivate() {
}
/*
* this is called after most of the services have been started but before any cluster resources or JMS resources have been
*/
void activated();
default void activated() {
}
/*
* this is called when the server is stopping, after any network resources and clients are closed but before the rest
* of the resources
*/
void deActivate();
default void deActivate() {
}
/*
* this is called when all resources have been started including any JMS resources
*/
void activationComplete();
default void activationComplete() {
}
}

12
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileLockNodeManager.java
View File

@ -170,18 +170,6 @@ public class FileLockNodeManager extends NodeManager {
ActiveMQServerLogger.LOGGER.obtainedLiveLock();
return new ActivateCallback() {
@Override
public void preActivate() {
}
@Override
public void activated() {
}
@Override
public void deActivate() {
}
@Override
public void activationComplete() {
try {

12
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/InVMNodeManager.java
View File

@ -108,18 +108,6 @@ public final class InVMNodeManager extends NodeManager {
state = FAILING_BACK;
liveLock.acquire();
return new ActivateCallback() {
@Override
public void preActivate() {
}
@Override
public void activated() {
}
@Override
public void deActivate() {
}
@Override
public void activationComplete() {
try {

12
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/jdbc/JdbcNodeManager.java
View File

@ -350,18 +350,6 @@ public final class JdbcNodeManager extends NodeManager {
ActiveMQServerLogger.LOGGER.obtainedLiveLock();
return new ActivateCallback() {
@Override
public void preActivate() {
}
@Override
public void activated() {
}
@Override
public void deActivate() {
}
@Override
public void activationComplete() {
try {

12
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
View File

@ -547,10 +547,6 @@ public class ManagementServiceImpl implements ManagementService {
* bridges won't be able to connect.
*/
messagingServer.registerActivateCallback(new ActivateCallback() {
@Override
public void preActivate() {
}
@Override
public void activated() {
try {
@ -559,14 +555,6 @@ public class ManagementServiceImpl implements ManagementService {
ActiveMQServerLogger.LOGGER.unableToCreateManagementNotificationAddress(managementNotificationAddress, e);
}
}
@Override
public void deActivate() {
}
@Override
public void activationComplete() {
}
});
}

15
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryBaseTest.java
View File

@ -195,21 +195,6 @@ public class DiscoveryBaseTest extends ActiveMQTestBase {
@Override
public ActivateCallback startLiveNode() throws Exception {
return new ActivateCallback() {
@Override
public void preActivate() {
}
@Override
public void activated() {
}
@Override
public void deActivate() {
}
@Override
public void activationComplete() {
}
};
}