Merge changes Ic434bf4a,I05a3fb18,I47a3783d,I8234bbfd

[controller.git] / opendaylight / netconf / config-netconf-connector / src / main / java / org / opendaylight / controller / netconf / confignetconfconnector / osgi / Activator.java

diff --git 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
index d544d1fb3394c6e114a1b4cb398e9786e5332a93..faaa17d5280f289ed6a004fd1f6df95165a02eda 100644 (file)
--- 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
@@ -28,7 +28,7 @@ public class Activator implements BundleActivator {
     private static final Logger LOG = LoggerFactory.getLogger(Activator.class);
 
     private BundleContext context;
     private static final Logger LOG = LoggerFactory.getLogger(Activator.class);
 
     private BundleContext context;

-    private ServiceRegistration osgiRegistration;
+    private ServiceRegistration<?> osgiRegistration;

     private ConfigRegistryLookupThread configRegistryLookup = null;
 
     @Override
     private ConfigRegistryLookupThread configRegistryLookup = null;
 
     @Override