[JENKINS-34324] Fix PCT against 2.0-rc-1

jenkinsci · Apr 19, 2016 · 91df7cc · 91df7cc
1 parent 97f8508
commit 91df7cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.3</version>
+    <version>2.7</version>
   </parent>
 
   <artifactId>mailer</artifactId>

diff --git a/src/main/java/jenkins/plugins/mailer/tasks/MimeMessageBuilder.java b/src/main/java/jenkins/plugins/mailer/tasks/MimeMessageBuilder.java
@@ -85,7 +85,7 @@ public MimeMessageBuilder() {
             JenkinsLocationConfiguration jlc = JenkinsLocationConfiguration.get();
             if (jlc != null) {
                 defaultSuffix = Mailer.descriptor().getDefaultSuffix();
-                from = JenkinsLocationConfiguration.get().getAdminAddress();
+                from = jlc.getAdminAddress();
                 final String rto = Mailer.descriptor().getReplyToAddress();
                 try {
                     replyTo.addAll(toNormalizedAddresses(rto));