You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by wu...@apache.org on 2018/06/04 02:03:03 UTC
[incubator-servicecomb-java-chassis] 03/06: [SCB-617] change
SCBEngine.uninit to SCBEngine.destroy
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 38f6c4699707f19e156dd3e494f77f3eee58016b
Author: wujimin <wu...@huawei.com>
AuthorDate: Fri Jun 1 02:22:11 2018 +0800
[SCB-617] change SCBEngine.uninit to SCBEngine.destroy
---
.../org/apache/servicecomb/core/CseApplicationListener.java | 2 +-
core/src/main/java/org/apache/servicecomb/core/SCBEngine.java | 10 +++++-----
.../test/java/org/apache/servicecomb/core/TestSCBEngine.java | 2 +-
.../apache/servicecomb/core/TestCseApplicationListener.java | 2 +-
.../demo/springmvc/tests/SpringMvcSpringIntegrationTest.java | 2 +-
.../demo/springmvc/tests/RawSpringMvcIntegrationTest.java | 2 +-
...ingMvcSpringSimplifiedMappingAnnotationIntegrationTest.java | 2 +-
...RawSpringMvcSimplifiedMappingAnnotationIntegrationTest.java | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/core/src/main/java/org/apache/servicecomb/core/CseApplicationListener.java b/core/src/main/java/org/apache/servicecomb/core/CseApplicationListener.java
index 28b6e73..38793cd 100644
--- a/core/src/main/java/org/apache/servicecomb/core/CseApplicationListener.java
+++ b/core/src/main/java/org/apache/servicecomb/core/CseApplicationListener.java
@@ -73,7 +73,7 @@ public class CseApplicationListener
SCBEngine.getInstance().init();
} else if (event instanceof ContextClosedEvent) {
- SCBEngine.getInstance().uninit();
+ SCBEngine.getInstance().destroy();
}
}
}
diff --git a/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java b/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
index 0616c25..4d2f157 100644
--- a/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
+++ b/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java
@@ -178,7 +178,7 @@ public class SCBEngine {
doInit();
status = SCBStatus.UP;
} catch (Exception e) {
- uninit();
+ destroy();
status = SCBStatus.FAILED;
throw new IllegalStateException("ServiceComb init failed.", e);
}
@@ -218,23 +218,23 @@ public class SCBEngine {
RegistryUtils.run();
- Runtime.getRuntime().addShutdownHook(new Thread(this::uninit));
+ Runtime.getRuntime().addShutdownHook(new Thread(this::destroy));
}
/**
* not allow throw any exception
* even some step throw exception, must catch it and go on, otherwise shutdown process will be broken.
*/
- public synchronized void uninit() {
+ public synchronized void destroy() {
if (SCBStatus.UP.equals(status)) {
LOGGER.info("ServiceComb is closing now...");
- doUninit();
+ doDestroy();
status = SCBStatus.DOWN;
LOGGER.info("ServiceComb had closed");
}
}
- private void doUninit() {
+ private void doDestroy() {
//Step 1: notify all component stop invoke via BEFORE_CLOSE Event
safeTriggerEvent(EventType.BEFORE_CLOSE);
diff --git a/core/src/test/java/org/apache/servicecomb/core/TestSCBEngine.java b/core/src/test/java/org/apache/servicecomb/core/TestSCBEngine.java
index f39636a..6b72f56 100644
--- a/core/src/test/java/org/apache/servicecomb/core/TestSCBEngine.java
+++ b/core/src/test/java/org/apache/servicecomb/core/TestSCBEngine.java
@@ -82,7 +82,7 @@ public class TestSCBEngine {
Assert.assertEquals(SCBStatus.UP, engine.getStatus());
- engine.uninit();
+ engine.destroy();
Assert.assertEquals(SCBStatus.DOWN, engine.getStatus());
Assert.assertTrue(configDestroy.get());
diff --git a/core/src/test/java/org/apache/servicecomb/core/org/apache/servicecomb/core/TestCseApplicationListener.java b/core/src/test/java/org/apache/servicecomb/core/org/apache/servicecomb/core/TestCseApplicationListener.java
index 26d7d78..aeac7e1 100644
--- a/core/src/test/java/org/apache/servicecomb/core/org/apache/servicecomb/core/TestCseApplicationListener.java
+++ b/core/src/test/java/org/apache/servicecomb/core/org/apache/servicecomb/core/TestCseApplicationListener.java
@@ -35,7 +35,7 @@ public class TestCseApplicationListener {
AtomicInteger count = new AtomicInteger();
SCBEngine scbEngine = new SCBEngine() {
@Override
- public synchronized void uninit() {
+ public synchronized void destroy() {
count.incrementAndGet();
}
};
diff --git a/integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringIntegrationTest.java b/integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringIntegrationTest.java
index fbbf181..c240f61 100644
--- a/integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringIntegrationTest.java
+++ b/integration-tests/springmvc-tests/springmvc-tests-general-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringIntegrationTest.java
@@ -35,6 +35,6 @@ public class SpringMvcSpringIntegrationTest extends SpringMvcIntegrationTestBase
@AfterClass
public static void shutdown() {
- SCBEngine.getInstance().uninit();
+ SCBEngine.getInstance().destroy();
}
}
diff --git a/integration-tests/springmvc-tests/springmvc-tests-general/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcIntegrationTest.java b/integration-tests/springmvc-tests/springmvc-tests-general/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcIntegrationTest.java
index 7a49b20..adb09ea 100644
--- a/integration-tests/springmvc-tests/springmvc-tests-general/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcIntegrationTest.java
+++ b/integration-tests/springmvc-tests/springmvc-tests-general/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcIntegrationTest.java
@@ -32,6 +32,6 @@ public class RawSpringMvcIntegrationTest extends SpringMvcIntegrationTestBase {
@AfterClass
public static void shutdown() {
- SCBEngine.getInstance().uninit();
+ SCBEngine.getInstance().destroy();
}
}
diff --git a/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringSimplifiedMappingAnnotationIntegrationTest.java b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringSimplifiedMappingAnnotationIntegrationTest.java
index 292f926..bf6f709 100644
--- a/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringSimplifiedMappingAnnotationIntegrationTest.java
+++ b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping-with-springboot/src/test/java/org/apache/servicecomb/demo/springmvc/tests/SpringMvcSpringSimplifiedMappingAnnotationIntegrationTest.java
@@ -36,6 +36,6 @@ public class SpringMvcSpringSimplifiedMappingAnnotationIntegrationTest extends S
@AfterClass
public static void shutdown() {
- SCBEngine.getInstance().uninit();
+ SCBEngine.getInstance().destroy();
}
}
diff --git a/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcSimplifiedMappingAnnotationIntegrationTest.java b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcSimplifiedMappingAnnotationIntegrationTest.java
index 35cdbd8..e836362 100644
--- a/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcSimplifiedMappingAnnotationIntegrationTest.java
+++ b/integration-tests/springmvc-tests/springmvc-tests-simplified-mapping/src/test/java/org/apache/servicecomb/demo/springmvc/tests/RawSpringMvcSimplifiedMappingAnnotationIntegrationTest.java
@@ -33,6 +33,6 @@ public class RawSpringMvcSimplifiedMappingAnnotationIntegrationTest extends Spri
@AfterClass
public static void shutdown() {
- SCBEngine.getInstance().uninit();
+ SCBEngine.getInstance().destroy();
}
}
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.