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 "Netconf-cli compilable and included in project"
[controller.git]
/
opendaylight
/
netconf
/
netconf-monitoring
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
monitoring
/
osgi
/
NetconfMonitoringServiceTracker.java
diff --git
a/opendaylight/netconf/netconf-monitoring/src/main/java/org/opendaylight/controller/netconf/monitoring/osgi/NetconfMonitoringServiceTracker.java
b/opendaylight/netconf/netconf-monitoring/src/main/java/org/opendaylight/controller/netconf/monitoring/osgi/NetconfMonitoringServiceTracker.java
index f99ae54e6dafac6e9ea01f36e85ab46261d9ce67..0b4d1c2688d64307b51815b0d3b441f0ff9722ec 100644
(file)
--- a/
opendaylight/netconf/netconf-monitoring/src/main/java/org/opendaylight/controller/netconf/monitoring/osgi/NetconfMonitoringServiceTracker.java
+++ b/
opendaylight/netconf/netconf-monitoring/src/main/java/org/opendaylight/controller/netconf/monitoring/osgi/NetconfMonitoringServiceTracker.java
@@
-20,7
+20,7
@@
import org.slf4j.LoggerFactory;
public class NetconfMonitoringServiceTracker extends ServiceTracker<NetconfMonitoringService, NetconfMonitoringService> {
public class NetconfMonitoringServiceTracker extends ServiceTracker<NetconfMonitoringService, NetconfMonitoringService> {
- private static final Logger
logger
= LoggerFactory.getLogger(NetconfMonitoringServiceTracker.class);
+ private static final Logger
LOG
= LoggerFactory.getLogger(NetconfMonitoringServiceTracker.class);
private ServiceRegistration<NetconfOperationServiceFactory> reg;
private ServiceRegistration<NetconfOperationServiceFactory> reg;
@@
-51,7
+51,7
@@
public class NetconfMonitoringServiceTracker extends ServiceTracker<NetconfMonit
try {
reg.unregister();
} catch (final Exception e) {
try {
reg.unregister();
} catch (final Exception e) {
-
logger
.warn("Ignoring exception while unregistering {}", reg, e);
+
LOG
.warn("Ignoring exception while unregistering {}", reg, e);
}
}
}
}
}
}