Merge "Fix: removed tabs from yang files."

[controller.git] / opendaylight / netconf / netconf-ssh / src / main / java / org / opendaylight / controller / netconf / osgi / NetconfSSHActivator.java

diff --git a/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/osgi/NetconfSSHActivator.java b/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/osgi/NetconfSSHActivator.java
index 446c5008960e92a001bf78f332435276dc1aef95..8b3c5d70adfae08090eaa0c8a3f2a210ed743726 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/osgi/NetconfSSHActivator.java
+++ b/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/osgi/NetconfSSHActivator.java
@@ -9,7 +9,6 @@ package org.opendaylight.controller.netconf.osgi;
 
 import com.google.common.base.Optional;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.net.InetSocketAddress;
 import org.opendaylight.controller.netconf.ssh.NetconfSSHServer;
 import org.opendaylight.controller.netconf.ssh.authentication.AuthProvider;
@@ -44,7 +43,7 @@ public class NetconfSSHActivator implements BundleActivator{
     ServiceTrackerCustomizer<IUserManager, IUserManager> customizer = new ServiceTrackerCustomizer<IUserManager, IUserManager>(){
         @Override
         public IUserManager addingService(ServiceReference<IUserManager> reference) {
-            logger.info("Service IUserManager added, let there be SSH bridge.");
+            logger.info("Service {} added, let there be SSH bridge.", reference);
             iUserManager =  context.getService(reference);
             try {
                 onUserManagerFound(iUserManager);
@@ -55,13 +54,13 @@ public class NetconfSSHActivator implements BundleActivator{
         }
         @Override
         public void modifiedService(ServiceReference<IUserManager> reference, IUserManager service) {
-            logger.info("Replacing modified service IUserManager in netconf SSH.");
+            logger.info("Replacing modified service {} in netconf SSH.", reference);
             server.addUserManagerService(service);
         }
         @Override
         public void removedService(ServiceReference<IUserManager> reference, IUserManager service) {
-            logger.info("Removing service IUserManager from netconf SSH. " +
-                    "SSH won't authenticate users until IUserManeger service will be started.");
+            logger.info("Removing service {} from netconf SSH. " +
+                    "SSH won't authenticate users until IUserManeger service will be started.", reference);
             removeUserManagerService();
         }
     };
@@ -92,24 +91,12 @@ public class NetconfSSHActivator implements BundleActivator{
             if (path.equals("")){
                 throw new Exception("Missing netconf.ssh.pk.path key in configuration file.");
             }
-            FileInputStream fis = null;
-            try {
-                fis = new FileInputStream(path);
-            } catch (FileNotFoundException e){
-                throw new Exception("Missing file described by netconf.ssh.pk.path key in configuration file.");
-            } catch (SecurityException e){
-                throw new Exception("Read access denied to file described by netconf.ssh.pk.path key in configuration file.");
-            }
-            AuthProvider authProvider = null;
-            try {
-                authProvider = new AuthProvider(iUserManager,fis);
-            } catch (Exception e){
-                if (fis!=null){
-                    fis.close();
-                }
-                throw (e);
+
+            try (FileInputStream fis = new FileInputStream(path)){
+                AuthProvider authProvider = new AuthProvider(iUserManager,fis);
+                this.server = NetconfSSHServer.start(sshSocketAddressOptional.get().getPort(),tcpSocketAddress,authProvider);
             }
-            this.server = NetconfSSHServer.start(sshSocketAddressOptional.get().getPort(),tcpSocketAddress,authProvider);
+
             Thread serverThread = new  Thread(server,"netconf SSH server thread");
             serverThread.setDaemon(true);
             serverThread.start();