Skip to content
Permalink
Browse files

[FIXED JENKINS-9702] Misuse of hudson.Util.fixEmptyAndTrim was causin…

…g NPEs.
  • Loading branch information...
abayer committed May 16, 2011
1 parent d6dc41c commit 89e610b7457d0f34e127e9d94f2af1202babf206
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/main/java/hudson/plugins/git/GitSCM.java
@@ -403,7 +403,7 @@ public String getGitConfigEmail() {
public String getGitConfigNameToUse() {
String confName;
String globalConfigName = ((DescriptorImpl) getDescriptor()).getGlobalConfigName();
if ((globalConfigName != null) && (gitConfigName == null) && (!fixEmptyAndTrim(globalConfigName).equals(""))) {
if ((fixEmptyAndTrim(globalConfigName) != null) && (gitConfigName == null)) {
confName = globalConfigName;
} else {
confName = gitConfigName;
@@ -415,7 +415,7 @@ public String getGitConfigNameToUse() {
public String getGitConfigEmailToUse() {
String confEmail;
String globalConfigEmail = ((DescriptorImpl) getDescriptor()).getGlobalConfigEmail();
if ((globalConfigEmail != null) && (gitConfigEmail == null) && (!fixEmptyAndTrim(globalConfigEmail).equals(""))) {
if ((fixEmptyAndTrim(globalConfigEmail) != null) && (gitConfigEmail == null)) {
confEmail = globalConfigEmail;
} else {
confEmail = gitConfigEmail;

0 comments on commit 89e610b

Please sign in to comment.
You can’t perform that action at this time.