sebb 2005/05/18 16:42:20
Modified: src/components/org/apache/jmeter/visualizers
MailerVisualizer.java
Log:
Revert change - not needed
Revision Changes Path
1.25 +9 -12
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
Index: MailerVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- MailerVisualizer.java 18 May 2005 21:40:13 -0000 1.24
+++ MailerVisualizer.java 18 May 2005 23:42:20 -0000 1.25
@@ -27,6 +27,8 @@
import java.awt.event.ActionListener;
import java.net.UnknownHostException;
+import javax.mail.MessagingException;
+import javax.mail.internet.AddressException;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JLabel;
@@ -47,7 +49,6 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
import org.apache.jorphan.logging.LoggingManager;
-import org.apache.jorphan.util.JMeterError;
import org.apache.log.Logger;
@@ -281,21 +282,17 @@
log.error("Invalid Mail Server ", e1);
displayMessage(JMeterUtils.getResString("invalid_mail_server"), true);
}
- catch (Exception ex)
+ catch (AddressException ex)
{
- if
(ex.getClass().getName().equals("javax.mail.internet.AddressException"))
- {
log.error("Invalid mail address ", ex);
displayMessage(JMeterUtils.getResString("invalid_mail_address")
+ "\n" + ex.getMessage(), true);
- } else if
(ex.getClass().getName().equals("javax.mail.MessagingException"))
- {
- log.error("Couldn't send mail...", ex);
-
displayMessage(JMeterUtils.getResString("invalid_mail")
- +"\n"+ex.getMessage(),
true);
- } else {
- throw new JMeterError("Unexpected
error",ex);
- }
+ }
+ catch (MessagingException ex)
+ {
+ log.error("Couldn't send mail...", ex);
+
displayMessage(JMeterUtils.getResString("invalid_mail")
+ +"\n"+ex.getMessage(), true);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
