[JENKINS-35562] Fix findbugs issues from core upgrade

jenkinsci · Jun 10, 2016 · 4d487bd · 4d487bd
1 parent ccef22d
commit 4d487bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/sshcredentials/SSHAuthenticator.java b/src/main/java/com/cloudbees/jenkins/plugins/sshcredentials/SSHAuthenticator.java
@@ -261,7 +261,7 @@ public static <C, U extends StandardUsernameCredentials> boolean isSupported(@No
                                                                                  @NonNull Class<U> userClass) {
         connectionClass.getClass(); // throw NPE if null
         userClass.getClass(); // throw NPE if null
-        for (SSHAuthenticatorFactory factory : Hudson.getInstance().getExtensionList(SSHAuthenticatorFactory.class)) {
+        for (SSHAuthenticatorFactory factory : ExtensionList.lookup(SSHAuthenticatorFactory.class)) {
             if (factory.supports(connectionClass, userClass)) {
                 return true;
             }

diff --git a/src/main/java/com/cloudbees/jenkins/plugins/sshcredentials/impl/BasicSSHUserPrivateKey.java b/src/main/java/com/cloudbees/jenkins/plugins/sshcredentials/impl/BasicSSHUserPrivateKey.java
@@ -36,6 +36,7 @@
 import hudson.remoting.Channel;
 import hudson.util.Secret;
 import java.io.ObjectStreamException;
+import jenkins.model.Jenkins;
 import net.jcip.annotations.GuardedBy;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
@@ -199,7 +200,7 @@ public String getDisplayName() {
         }
 
         public DescriptorExtensionList<PrivateKeySource, Descriptor<PrivateKeySource>> getPrivateKeySources() {
-            return Hudson.getInstance().getDescriptorList(PrivateKeySource.class);
+            return Jenkins.getActiveInstance().getDescriptorList(PrivateKeySource.class);
         }
 
         /**