Log exception, and handle null region outside of catch block

jenkinsci · Feb 24, 2019 · 3b26433 · 3b26433
1 parent 444c6a6
commit 3b26433
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/awscredentials/AWSCredentialsImpl.java b/src/main/java/com/cloudbees/jenkins/plugins/awscredentials/AWSCredentialsImpl.java
@@ -119,17 +119,16 @@ public AWSCredentials getCredentials() {
             return initialCredentials;
         } else {
             // Check for available region from the SDK, otherwise specify default
-            String clientRegion;
+            String clientRegion = null;
             DefaultAwsRegionProviderChain sdkRegionLookup = new DefaultAwsRegionProviderChain();
             try {
                 clientRegion = sdkRegionLookup.getRegion();
             }
             catch(com.amazonaws.SdkClientException e) {
-                if (e.getMessage() == "Unable to load region information from any provider in the chain") {
-                    clientRegion = Regions.DEFAULT_REGION.getName();
-                } else {
-                    throw e;
-                }
+                LOGGER.log(Level.WARNING,"Could not find default region using SDK lookup.", e);
+            }
+            if (clientRegion == null) {
+                clientRegion = Regions.DEFAULT_REGION.getName();
             }
 
             AWSSecurityTokenService client;