Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Modify ModuleInfoBundleTracker to track RESOLVED bundles
[controller.git]
/
opendaylight
/
config
/
config-manager
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
manager
/
impl
/
osgi
/
BeanToOsgiServiceManager.java
diff --git
a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BeanToOsgiServiceManager.java
b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BeanToOsgiServiceManager.java
index b592fa3c79736d09b22f0b133bef142702783dbb..67475dacf86dde967fbf1877d5892678836a0d28 100644
(file)
--- a/
opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BeanToOsgiServiceManager.java
+++ b/
opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BeanToOsgiServiceManager.java
@@
-49,7
+49,7
@@
public class BeanToOsgiServiceManager {
public static class OsgiRegistration implements AutoCloseable {
public static class OsgiRegistration implements AutoCloseable {
- private static final Logger
logger
= LoggerFactory.getLogger(OsgiRegistration.class);
+ private static final Logger
LOG
= LoggerFactory.getLogger(OsgiRegistration.class);
@GuardedBy("this")
private AutoCloseable instance;
@GuardedBy("this")
private AutoCloseable instance;
@@
-89,7
+89,7
@@
public class BeanToOsgiServiceManager {
try {
serviceRegistration.unregister();
} catch(IllegalStateException e) {
try {
serviceRegistration.unregister();
} catch(IllegalStateException e) {
-
logger
.trace("Cannot unregister {}", serviceRegistration, e);
+
LOG
.trace("Cannot unregister {}", serviceRegistration, e);
}
}
serviceRegistrations.clear();
}
}
serviceRegistrations.clear();
@@
-101,7
+101,7
@@
public class BeanToOsgiServiceManager {
notEquals |= newAnnotationMapping.equals(serviceNamesToAnnotations) == false;
if (notEquals) {
// FIXME: changing from old state to new state can be improved by computing the diff
notEquals |= newAnnotationMapping.equals(serviceNamesToAnnotations) == false;
if (notEquals) {
// FIXME: changing from old state to new state can be improved by computing the diff
-
logger
.debug("Detected change in service registrations for {}: old: {}, new: {}", moduleIdentifier,
+
LOG
.debug("Detected change in service registrations for {}: old: {}, new: {}", moduleIdentifier,
serviceNamesToAnnotations, newAnnotationMapping);
close();
this.instance = newInstance;
serviceNamesToAnnotations, newAnnotationMapping);
close();
this.instance = newInstance;