Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Resolve Bug:853 - remove groovy from config code generator."
[controller.git]
/
opendaylight
/
config
/
shutdown-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
yang
/
shutdown
/
impl
/
ShutdownServiceImpl.java
diff --git
a/opendaylight/config/shutdown-impl/src/main/java/org/opendaylight/controller/config/yang/shutdown/impl/ShutdownServiceImpl.java
b/opendaylight/config/shutdown-impl/src/main/java/org/opendaylight/controller/config/yang/shutdown/impl/ShutdownServiceImpl.java
index f9622192fec873f3fc01c1396aa4c06ccb8f1624..4abbd3b36f761b71bc521c9a769f091e8afa3b44 100644
(file)
--- a/
opendaylight/config/shutdown-impl/src/main/java/org/opendaylight/controller/config/yang/shutdown/impl/ShutdownServiceImpl.java
+++ b/
opendaylight/config/shutdown-impl/src/main/java/org/opendaylight/controller/config/yang/shutdown/impl/ShutdownServiceImpl.java
@@
-82,7
+82,6
@@
class Impl implements ShutdownService {
class StopSystemBundleThread extends Thread {
private static final Logger logger = LoggerFactory.getLogger(StopSystemBundleThread.class);
class StopSystemBundleThread extends Thread {
private static final Logger logger = LoggerFactory.getLogger(StopSystemBundleThread.class);
- public static final String CONFIG_MANAGER_SYMBOLIC_NAME = "org.opendaylight.controller.config-manager";
private final Bundle systemBundle;
StopSystemBundleThread(Bundle systemBundle) {
private final Bundle systemBundle;
StopSystemBundleThread(Bundle systemBundle) {
@@
-95,13
+94,6
@@
class StopSystemBundleThread extends Thread {
try {
// wait so that JMX response is received
Thread.sleep(1000);
try {
// wait so that JMX response is received
Thread.sleep(1000);
- // first try to stop config-manager
- Bundle configManager = findConfigManager();
- if (configManager != null){
- logger.debug("Stopping config-manager");
- configManager.stop();
- Thread.sleep(1000);
- }
logger.debug("Stopping system bundle");
systemBundle.stop();
} catch (BundleException e) {
logger.debug("Stopping system bundle");
systemBundle.stop();
} catch (BundleException e) {
@@
-110,16
+102,6
@@
class StopSystemBundleThread extends Thread {
logger.warn("Shutdown process interrupted", e);
}
}
logger.warn("Shutdown process interrupted", e);
}
}
-
- private Bundle findConfigManager() {
- for(Bundle bundle: systemBundle.getBundleContext().getBundles()){
- if (CONFIG_MANAGER_SYMBOLIC_NAME.equals(bundle.getSymbolicName())) {
- return bundle;
- }
- }
- return null;
- }
-
}
class CallSystemExitThread extends Thread {
}
class CallSystemExitThread extends Thread {