Fix NPE (#271)

basil · web-flow · commit 41c19afb5dcf · 2025-01-27T11:41:44.000-08:00
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/awscredentials/AWSCredentialsImpl.java b/src/main/java/com/cloudbees/jenkins/plugins/awscredentials/AWSCredentialsImpl.java
@@ -238,7 +238,8 @@ public AwsCredentials resolveCredentials(String mfaToken) {
     @Deprecated
     @Override
     public AWSCredentials getCredentials() {
-        return fromAwsCredentials(resolveCredentials());
+        AwsCredentials credentials = resolveCredentials();
+        return credentials != null ? fromAwsCredentials(credentials) : null;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,8 @@ public AwsCredentials resolveCredentials(String mfaToken) {`
`238`	`238`	`@Deprecated`
`239`	`239`	`@Override`
`240`	`240`	`public AWSCredentials getCredentials() {`
`241`		`- return fromAwsCredentials(resolveCredentials());`
	`241`	`+ AwsCredentials credentials = resolveCredentials();`
	`242`	`+ return credentials != null ? fromAwsCredentials(credentials) : null;`
`242`	`243`	`}`
`243`	`244`
`244`	`245`	`/**`