Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[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 832cb47
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -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>
Expand Down
10 changes: 2 additions & 8 deletions src/main/java/hudson/plugins/git/GitChangeSet.java
Expand Up @@ -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() {
Expand Down

0 comments on commit 832cb47

Please sign in to comment.