Skip to content
Permalink
Browse files

[FIXED JENKINS-16849] don't trigger MailAddressResolver invocation

use hasExplicitlyConfiguredAddress (1.448) to check MailerProperty is set
  • Loading branch information...
ndeloof committed Feb 21, 2013
1 parent 68d9eb9 commit 832cb474c536b330b14a547f21c4bc1a79b85cb3
Showing with 3 additions and 9 deletions.
  1. +1 −1 pom.xml
  2. +2 −8 src/main/java/hudson/plugins/git/GitChangeSet.java
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.424</version>
<version>1.448</version>
</parent>

<artifactId>git</artifactId>
@@ -284,15 +284,9 @@ public User findOrCreateUser(String csAuthor, String csAuthorEmail, boolean crea
}

private boolean isMailerPropertySet(User user) {
boolean isPropertySet = false;
UserProperty property = user.getProperty(Mailer.UserProperty.class);
if (property == null) {
// if(!StringUtils.isEmpty(property.getAddress())) {
isPropertySet = true;
// }
}

return isPropertySet;
return property != null
&& property.hasExplicitlyConfiguredAddress();
}

private boolean isCreateAccountBasedOnEmail() {

0 comments on commit 832cb47

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