You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/12/21 16:56:59 UTC
svn commit: r1775505 -
/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
Author: pmouawad
Date: Wed Dec 21 16:56:59 2016
New Revision: 1775505
URL: http://svn.apache.org/viewvc?rev=1775505&view=rev
Log:
Sonar : Fix code smells
Modified:
jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
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=1775505&r1=1775504&r2=1775505&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java Wed Dec 21 16:56:59 2016
@@ -209,7 +209,7 @@ public class MailerModel extends Abstrac
// Send the mail ...
List<String> addressList = getAddressList();
- if (addressList.size() != 0) {
+ if (!addressList.isEmpty()) {
try {
sendMail(getFromAddress(), addressList, getFailureSubject(), "URL Failed: "
+ sample.getSampleLabel(), getSmtpHost(),
@@ -225,24 +225,20 @@ public class MailerModel extends Abstrac
}
}
- if (sendMails && siteDown && (sample.getTime() != -1) && !successMsgSent) {
- // Send the mail ...
- if (successCount > getSuccessLimit()) {
- List<String> addressList = getAddressList();
-
- try {
- sendMail(getFromAddress(), addressList, getSuccessSubject(), "URL Restarted: "
- + sample.getSampleLabel(), getSmtpHost(),
- getSmtpPort(), getLogin(), getPassword(),
- getMailAuthType(), false);
- } catch (Exception e) {
- log.error("Problem sending mail", e);
- }
- siteDown = false;
- successMsgSent = true;
- failureCount = 0;
- failureMsgSent = false;
+ if (sendMails && siteDown && (sample.getTime() != -1) && !successMsgSent && successCount > getSuccessLimit()) {
+ List<String> addressList = getAddressList();
+ try {
+ sendMail(getFromAddress(), addressList, getSuccessSubject(), "URL Restarted: "
+ + sample.getSampleLabel(), getSmtpHost(),
+ getSmtpPort(), getLogin(), getPassword(),
+ getMailAuthType(), false);
+ } catch (Exception e) {
+ log.error("Problem sending mail", e);
}
+ siteDown = false;
+ successMsgSent = true;
+ failureCount = 0;
+ failureMsgSent = false;
}
if (successMsgSent && failureMsgSent) {
@@ -259,7 +255,7 @@ public class MailerModel extends Abstrac
* they are independent of the sampling.
*/
@Override
- public synchronized void clear() {// TODO: should this be clearData()?
+ public synchronized void clear() {
failureCount = 0;
successCount = 0;
siteDown = false;
@@ -460,20 +456,10 @@ public class MailerModel extends Abstrac
setProperty(SUCCESS_LIMIT_KEY, limit);
}
- // private void setSuccessCount(long count)
- // {
- // this.successCount = count;
- // }
-
public void setFailureLimit(String limit) {
setProperty(FAILURE_LIMIT_KEY, limit);
}
- // private void setFailureCount(long count)
- // {
- // this.failureCount = count;
- // }
-
public String getToAddress() {
return getPropertyAsString(TO_KEY);
}