Author: sebb
Date: Thu Feb 9 01:12:11 2012
New Revision: 1242199
URL: http://svn.apache.org/viewvc?rev=1242199&view=rev
Log:
Bug 52614 - MailerModel.sendMail has strange way to calculate debug setting
Modified:
jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
jmeter/trunk/xdocs/changes.xml
Modified:
jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java?rev=1242199&r1=1242198&r2=1242199&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
Thu Feb 9 01:12:11 2012
@@ -214,7 +214,7 @@ public class MailerModel extends Abstrac
sendMail(getFromAddress(), addressList,
getFailureSubject(), "URL Failed: "
+ sample.getSampleLabel(), getSmtpHost(),
getSmtpPort(), getLogin(), getPassword(),
- getMailAuthType());
+ getMailAuthType(), false);
} catch (Exception e) {
log.error("Problem sending mail: "+e);
}
@@ -234,7 +234,7 @@ public class MailerModel extends Abstrac
sendMail(getFromAddress(), addressList,
getSuccessSubject(), "URL Restarted: "
+ sample.getSampleLabel(), getSmtpHost(),
getSmtpPort(), getLogin(), getPassword(),
- getMailAuthType());
+ getMailAuthType(), false);
} catch (Exception e) {
log.error("Problem sending mail", e);
}
@@ -300,7 +300,7 @@ public class MailerModel extends Abstrac
*/
public void sendMail(String from, List<String> vEmails, String subject,
String attText, String smtpHost)
throws AddressException, MessagingException {
- sendMail(from, vEmails, subject, attText, smtpHost, DEFAULT_SMTP_PORT,
null, null, null);
+ sendMail(from, vEmails, subject, attText, smtpHost, DEFAULT_SMTP_PORT,
null, null, null, false);
}
/**
@@ -329,11 +329,10 @@ public class MailerModel extends Abstrac
String smtpPort,
final String user,
final String password,
- MailAuthType mailAuthType)
+ MailAuthType mailAuthType,
+ boolean debug)
throws AddressException, MessagingException{
- boolean debug = Boolean.valueOf(smtpHost).booleanValue(); // TODO See
Bug 52614
-
InternetAddress[] address = new InternetAddress[vEmails.size()];
for (int k = 0; k < vEmails.size(); k++) {
@@ -404,7 +403,8 @@ public class MailerModel extends Abstrac
getSmtpPort(),
getLogin(),
getPassword(),
- getMailAuthType());
+ getMailAuthType(),
+ true);
log.info("Test mail sent successfully!!");
}
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1242199&r1=1242198&r2=1242199&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Thu Feb 9 01:12:11 2012
@@ -137,6 +137,7 @@ or a Debug Sampler with all fields set t
<h3>General</h3>
<ul>
<li>Bug 45839 - Test Action : Allow premature exit from a loop</li>
+<li>Bug 52614 - MailerModel.sendMail has strange way to calculate debug
setting</li>
</ul>
<h2>Non-functional changes</h2>
