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 "Statistics-Manager - Performance Improvement 1) Introduced statistics request...
[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 6cdcf605b04716537d73252d75443e92506b3a14..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
@@
-94,6
+94,7
@@
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);
+ logger.debug("Stopping system bundle");
systemBundle.stop();
} catch (BundleException e) {
logger.warn("Can not stop OSGi server", e);
systemBundle.stop();
} catch (BundleException e) {
logger.warn("Can not stop OSGi server", e);
@@
-138,7
+139,7
@@
class CallSystemExitThread extends Thread {
logger.warn("Thread dump:{}", sb);
System.exit(1);
} catch (InterruptedException e) {
logger.warn("Thread dump:{}", sb);
System.exit(1);
} catch (InterruptedException e) {
- logger.
info
("Interrupted, not going to call System.exit(1)");
+ logger.
warn
("Interrupted, not going to call System.exit(1)");
}
}
}
}
}
}