cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ja...@apache.org
Subject svn commit: r688851 - in /cocoon: branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/transformation/ trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/transformation/
Date Mon, 25 Aug 2008 19:46:25 GMT
Author: jasha
Date: Mon Aug 25 12:46:24 2008
New Revision: 688851

URL: http://svn.apache.org/viewvc?rev=688851&view=rev
Log:
COCOON-2213 reverted part of previous commit that prevented setting an alternative charset
of plain text mail

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java?rev=688851&r1=688850&r2=688851&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java
Mon Aug 25 12:46:24 2008
@@ -604,7 +604,7 @@
 
         // make it a simple plain text message in the case of a set plain/text
         // mime-type and any attachements
-        if (this.bodyMimeType.startsWith("text/plain") && this.attachments.size()
== 0) {
+        if (("text/plain").equals(this.bodyMimeType) && this.attachments.size() ==
0) {
             sm.setText(messageString);
         }
         // add message as message body part

Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java?rev=688851&r1=688850&r2=688851&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java
(original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java
Mon Aug 25 12:46:24 2008
@@ -604,7 +604,7 @@
 
         // make it a simple plain text message in the case of a set plain/text
         // mime-type and any attachements
-        if (this.bodyMimeType.startsWith("text/plain") && this.attachments.size()
== 0) {
+        if (("text/plain").equals(this.bodyMimeType) && this.attachments.size() ==
0) {
             sm.setText(messageString);
         }
         // add message as message body part



Mime
View raw message