From: Tony Tkacik <ttkacik@cisco.com>
Date: Thu, 20 Nov 2014 09:05:53 +0000 (+0000)
Subject: Merge changes Ic434bf4a,I05a3fb18,I47a3783d,I8234bbfd
X-Git-Tag: release/lithium~863
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=992a433ff8fd0ce7335bf5ea9e59a75602a95a19

Merge changes Ic434bf4a,I05a3fb18,I47a3783d,I8234bbfd

* changes:
  Fix checkstyle warnings in netconf-cli
  Fix checkstyle warnings ietf-netconf-monitoring
  Fix checkstyle warnings for netconf-testtool
  Fix checkstyle warnings for config-netconf-connector
---

992a433ff8fd0ce7335bf5ea9e59a75602a95a19
diff --cc opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/Activator.java
index 99f9c04fcc,d544d1fb33..faaa17d528
--- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/Activator.java
+++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/Activator.java
@@@ -19,17 -23,12 +23,12 @@@ import org.osgi.util.tracker.ServiceTra
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
- import java.util.Dictionary;
- import java.util.Hashtable;
- 
- import static com.google.common.base.Preconditions.checkState;
- 
  public class Activator implements BundleActivator {
  
-     private static final Logger logger = LoggerFactory.getLogger(Activator.class);
+     private static final Logger LOG = LoggerFactory.getLogger(Activator.class);
  
      private BundleContext context;
 -    private ServiceRegistration osgiRegistration;
 +    private ServiceRegistration<?> osgiRegistration;
      private ConfigRegistryLookupThread configRegistryLookup = null;
  
      @Override