[FIXED JENKINS-41820] Missed some comparisons that were case sensitive

jenkinsci · Feb 9, 2017 · 5cc878c · 5cc878c
1 parent e3f026a
commit 5cc878c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestGHEventSubscriber.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestGHEventSubscriber.java
@@ -216,7 +216,7 @@ && isApiMatch(((GitHubSCMSource) source).getApiUri())
             }
             boolean hasPR = false;
 
-            boolean fork = !src.getRepoOwner().equals(prOwnerName);
+            boolean fork = !src.getRepoOwner().equalsIgnoreCase(prOwnerName);
 
             Map<SCMHead, SCMRevision> result = new HashMap<>();
 

diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/PushGHEventSubscriber.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/PushGHEventSubscriber.java
@@ -160,13 +160,13 @@ public SCMHeadEventImpl(Type type, GHEventPayload.Push pullRequest, GitHubReposi
         }
 
         private boolean isApiMatch(String apiUri) {
-            return repoHost.equals(RepositoryUriResolver.hostnameFromApiUri(apiUri));
+            return repoHost.equalsIgnoreCase(RepositoryUriResolver.hostnameFromApiUri(apiUri));
         }
 
         @Override
         public boolean isMatch(@NonNull SCMNavigator navigator) {
             return navigator instanceof GitHubSCMNavigator
-                    && repoOwner.equals(((GitHubSCMNavigator) navigator).getRepoOwner());
+                    && repoOwner.equalsIgnoreCase(((GitHubSCMNavigator) navigator).getRepoOwner());
         }
 
         @NonNull
@@ -180,8 +180,8 @@ public String getSourceName() {
         public Map<SCMHead, SCMRevision> heads(@NonNull SCMSource source) {
             if (!(source instanceof GitHubSCMSource
                     && isApiMatch(((GitHubSCMSource) source).getApiUri())
-                    && repoOwner.equals(((GitHubSCMSource) source).getRepoOwner())
-                    && repository.equals(((GitHubSCMSource) source).getRepository()))) {
+                    && repoOwner.equalsIgnoreCase(((GitHubSCMSource) source).getRepoOwner())
+                    && repository.equalsIgnoreCase(((GitHubSCMSource) source).getRepository()))) {
                 return Collections.emptyMap();
             }
             GitHubSCMSource src = (GitHubSCMSource) source;