You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by sg...@apache.org on 2017/07/20 19:33:41 UTC
svn commit: r1802526 - in
/commons/proper/email/trunk/src/main/java/org/apache/commons/mail:
Email.java EmailUtils.java resolver/DataSourceClassPathResolver.java
Author: sgoeschl
Date: Thu Jul 20 19:33:41 2017
New Revision: 1802526
URL: http://svn.apache.org/viewvc?rev=1802526&view=rev
Log:
Code cosmetic - fix a couple of Checkstyle warnings
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailUtils.java
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java?rev=1802526&r1=1802525&r2=1802526&view=diff
==============================================================================
--- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java (original)
+++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java Thu Jul 20 19:33:41 2017
@@ -1237,7 +1237,8 @@ public abstract class Email
* @return An Email.
* @since 1.0
*/
- public Email setSubject(final String aSubject) {
+ public Email setSubject(final String aSubject)
+ {
this.subject = EmailUtils.replaceEndOfLineCharactersWithSpaces(aSubject);
return this;
}
Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailUtils.java?rev=1802526&r1=1802525&r2=1802526&view=diff
==============================================================================
--- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailUtils.java (original)
+++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailUtils.java Thu Jul 20 19:33:41 2017
@@ -271,14 +271,15 @@ final class EmailUtils
/**
* Replaces end-of-line characters with spaces.
- *
+ *
* @param input the input string to be scanned.
* @return a clean string
*/
- static String replaceEndOfLineCharactersWithSpaces(final String input) {
+ static String replaceEndOfLineCharactersWithSpaces(final String input)
+ {
return input == null ? null : input.replace('\n', ' ').replace('\r', ' ');
}
-
+
/**
* Encodes an input string according to RFC 2392. Unsafe characters are escaped.
*
Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java?rev=1802526&r1=1802525&r2=1802526&view=diff
==============================================================================
--- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java (original)
+++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java Thu Jul 20 19:33:41 2017
@@ -101,7 +101,8 @@ public class DataSourceClassPathResolver
// similar to other DataSource implementations, e.g. FileDataSource, URLDataSource
ds.setName(DataSourceClassPathResolver.class.getResource(resourceName).toString());
result = ds;
- } finally
+ }
+ finally
{
is.close();
}