Merge pull request #328 from dwnusbaum/release-connections

Always call Connector.release after Connector.connect

Author: bitwiseman

src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubAppCredentials.java

@@ -291,7 +291,11 @@ public FormValidation doTestConnection(
 
             try {
                 GitHub connect = Connector.connect(apiUri, gitHubAppCredential);
-                return FormValidation.ok("Success, Remaining rate limit: " + connect.getRateLimit().getRemaining());
+                try {
+                    return FormValidation.ok("Success, Remaining rate limit: " + connect.getRateLimit().getRemaining());
+                } finally {
+                    Connector.release(connect);
+                }
             } catch (Exception e) {
                 return FormValidation.error(e, String.format(ERROR_AUTHENTICATING_GITHUB_APP, appID));
             }

src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java

@@ -2025,15 +2025,19 @@ public FormValidation doValidateRepositoryUrlAndCredentials(@CheckForNull @Ances
             StringBuilder sb = new StringBuilder();
             try {
                 GitHub github = Connector.connect(info.getApiUri(), credentials);
-                if (github.isCredentialValid()){
-                    sb.append("Credentials ok.");
-                }
+                try {
+                    if (github.isCredentialValid()){
+                        sb.append("Credentials ok.");
+                    }
 
-                GHRepository repo = github.getRepository(info.getRepoOwner() + "/" + info.getRepository());
-                if (repo != null) {
-                    sb.append(" Connected to ");
-                    sb.append(repo.getHtmlUrl());
-                    sb.append(".");
+                    GHRepository repo = github.getRepository(info.getRepoOwner() + "/" + info.getRepository());
+                    if (repo != null) {
+                        sb.append(" Connected to ");
+                        sb.append(repo.getHtmlUrl());
+                        sb.append(".");
+                    }
+                } finally {
+                    Connector.release(github);
                 }
             } catch (IOException e) {
                 return FormValidation.error(e, "Error validating repository information. " + sb.toString());
@@ -2133,12 +2137,16 @@ public ListBoxModel doFillOrganizationItems(@CheckForNull @AncestorInPath Item c
             try {
                 StandardCredentials credentials = Connector.lookupScanCredentials(context, apiUri, credentialsId);
                 GitHub github = Connector.connect(apiUri, credentials);
-                if (!github.isAnonymous()) {
-                    ListBoxModel model = new ListBoxModel();
-                    for (Map.Entry<String,GHOrganization> entry : github.getMyOrganizations().entrySet()) {
-                        model.add(entry.getKey(), entry.getValue().getAvatarUrl());
+                try {
+                    if (!github.isAnonymous()) {
+                        ListBoxModel model = new ListBoxModel();
+                        for (Map.Entry<String,GHOrganization> entry : github.getMyOrganizations().entrySet()) {
+                            model.add(entry.getKey(), entry.getValue().getAvatarUrl());
+                        }
+                        return model;
                     }
-                    return model;
+                } finally {
+                    Connector.release(github);
                 }
             }
              catch (FillErrorResponse e) {