Merge pull request #108 from recampbell/JENKINS-24676

[FIXED JENKINS-24676]: Give the user a readable error message
jenkinsci · Oct 27, 2014 · 420806e · 420806e
2 parents d823b5e + 954f599
commit 420806e
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main/java/hudson/plugins/ec2/AmazonEC2Cloud.java b/src/main/java/hudson/plugins/ec2/AmazonEC2Cloud.java
@@ -24,6 +24,7 @@
 package hudson.plugins.ec2;
 
 import hudson.Extension;
+import hudson.Util;
 import hudson.slaves.Cloud;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
@@ -146,6 +147,11 @@ public FormValidation doTestConnection(
                  @QueryParameter String accessId,
                  @QueryParameter String secretKey,
                  @QueryParameter String privateKey) throws IOException, ServletException {
+
+            if (Util.fixEmpty(region) == null) {
+                region = DEFAULT_EC2_HOST;
+            }
+
             return super.doTestConnection(getEc2EndpointUrl(region),accessId,secretKey,privateKey);
         }