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

…g NPEs.
jenkinsci · May 16, 2011 · 89e610b · 89e610b
1 parent d6dc41c
commit 89e610b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/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;