[FIXED JENKINS-45551] The TODO comments were correct

jenkinsci · Jul 14, 2017 · 26a8b39 · 26a8b39
1 parent 388545b
commit 26a8b39
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/BranchDiscoveryTrait.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/BranchDiscoveryTrait.java
@@ -232,9 +232,9 @@ public static class ExcludeOriginPRBranchesSCMHeadFilter extends SCMHeadFilter {
         @Override
         public boolean isExcluded(@NonNull SCMSourceRequest request, @NonNull SCMHead head) {
             if (head instanceof BranchSCMHead && request instanceof GitHubSCMSourceRequest) {
-                for (GHPullRequest pullRequest : ((GitHubSCMSourceRequest) request).getPullRequests()) {
-                    if (pullRequest.getHead().getRef().equals(head.getName())) {
-                        // TODO correct is also a PR test
+                for (GHPullRequest p : ((GitHubSCMSourceRequest) request).getPullRequests()) {
+                    if (p.getBase().getRepository().getFullName().equalsIgnoreCase(p.getHead().getRepository().getFullName())
+                            && p.getHead().getRef().equals(head.getName())) {
                         return true;
                     }
                 }
@@ -253,12 +253,14 @@ public static class OnlyOriginPRBranchesSCMHeadFilter extends SCMHeadFilter {
         @Override
         public boolean isExcluded(@NonNull SCMSourceRequest request, @NonNull SCMHead head) {
             if (head instanceof BranchSCMHead && request instanceof GitHubSCMSourceRequest) {
-                for (GHPullRequest pullRequest : ((GitHubSCMSourceRequest) request).getPullRequests()) {
-                    if (!pullRequest.getHead().getRef().equals(head.getName())) {
-                        // TODO correct is also a PR test
-                        return true;
+                for (GHPullRequest p : ((GitHubSCMSourceRequest) request).getPullRequests()) {
+                    if (p.getBase().getRepository().getFullName()
+                            .equalsIgnoreCase(p.getHead().getRepository().getFullName())
+                            && p.getHead().getRef().equals(head.getName())) {
+                        return false;
                     }
                 }
+                return true;
             }
             return false;
         }