Fix various netconf warnings

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

diff --git a/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/osgi/AuthProviderTracker.java b/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/osgi/AuthProviderTracker.java
index c473b70eee7a981dadd71f671ec462abcab215cd..f1de980e88cf49f315b8d46d7fa1da2575d3ad0e 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/osgi/AuthProviderTracker.java
+++ b/opendaylight/netconf/netconf-ssh/src/main/java/org/opendaylight/controller/netconf/ssh/osgi/AuthProviderTracker.java
@@ -47,7 +47,7 @@ final class AuthProviderTracker implements ServiceTrackerCustomizer<AuthProvider
         return authService;
     }
 
-    private Integer getPreference(final ServiceReference<AuthProvider> reference) {
+    private static Integer getPreference(final ServiceReference<AuthProvider> reference) {
         final Object preferenceProperty = reference.getProperty(AuthConstants.SERVICE_PREFERENCE_KEY);
         return preferenceProperty == null ? Integer.MIN_VALUE : Integer.valueOf(preferenceProperty.toString());
     }
@@ -86,6 +86,10 @@ final class AuthProviderTracker implements ServiceTrackerCustomizer<AuthProvider
 
     @Override
     public boolean authenticate(final String username, final String password, final ServerSession session) {
-        return authProvider == null ? false : authProvider.authenticated(username, password);
+        if (authProvider == null) {
+            LOG.warn("AuthProvider is missing, failing authentication");
+            return false;
+        }
+        return authProvider.authenticated(username, password);
     }
 }