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 "Add get-config commit edit-config to testtool"
[controller.git]
/
opendaylight
/
config
/
config-manager
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
manager
/
impl
/
util
/
OsgiRegistrationUtil.java
diff --git
a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtil.java
b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtil.java
index 2df28f0a154b8b7a6e37f1930b5e06d46efda675..f839452dcadb8e1295e8a1669154ea51699af5f5 100644
(file)
--- a/
opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtil.java
+++ b/
opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtil.java
@@
-21,7
+21,10
@@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class OsgiRegistrationUtil {
import org.slf4j.LoggerFactory;
public class OsgiRegistrationUtil {
- private static final Logger logger = LoggerFactory.getLogger(OsgiRegistrationUtil.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(OsgiRegistrationUtil.class);
+
+ private OsgiRegistrationUtil() {
+ }
@SafeVarargs
public static <T> AutoCloseable registerService(BundleContext bundleContext, T service, Class<? super T> ... interfaces) {
@SafeVarargs
public static <T> AutoCloseable registerService(BundleContext bundleContext, T service, Class<? super T> ... interfaces) {
@@
-80,7
+83,7
@@
public class OsgiRegistrationUtil {
try {
ac.close();
} catch (Exception e) {
try {
ac.close();
} catch (Exception e) {
-
logger
.warn("Exception while closing {}", ac, e);
+
LOGGER
.warn("Exception while closing {}", ac, e);
if (firstException == null) {
firstException = e;
} else {
if (firstException == null) {
firstException = e;
} else {