Author: dennisl
Date: Fri Dec 17 23:48:56 2010
New Revision: 1050533
URL: http://svn.apache.org/viewvc?rev=1050533&view=rev
Log:
[MCHANGES-72] Build Failure using IBM JDK 1.4.2 SR7
o Improve the error message
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java?rev=1050533&r1=1050532&r2=1050533&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
Fri Dec 17 23:48:56 2010
@@ -86,15 +86,24 @@ public class ProjectJavamailMailSender
if ( isSslMode() )
{
- Security.addProvider( new com.sun.net.ssl.internal.ssl.Provider()
);
+ try
+ {
+ // Try to load the SSL Provider class before we use it, it
isn't present in non-Sun JVMs
+ this.getClass().getClassLoader().loadClass(
"com.sun.net.ssl.internal.ssl.Provider" );
- props.put( "mail.smtp.socketFactory.port", String.valueOf(
getSmtpPort() ) );
+ Security.addProvider( new
com.sun.net.ssl.internal.ssl.Provider() );
- props.put( "mail.smtp.socketFactory.class", SSL_FACTORY );
+ props.put( "mail.smtp.socketFactory.port", String.valueOf(
getSmtpPort() ) );
- props.put( "mail.smtp.socketFactory.fallback", "false" );
- }
+ props.put( "mail.smtp.socketFactory.class", SSL_FACTORY );
+ props.put( "mail.smtp.socketFactory.fallback", "false" );
+ }
+ catch ( ClassNotFoundException e )
+ {
+ getLogger().error( "You can't use sslMode because your system
is missing an SSL Provider.", e );
+ }
+ }
if ( userProperties != null )
{
for ( Iterator i = userProperties.keySet().iterator();
i.hasNext(); )
