You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by mw...@apache.org on 2009/01/24 15:19:37 UTC

svn commit: r737361 - in /james/mime4j/trunk/src: main/java/org/apache/james/mime4j/field/address/Group.java test/java/org/apache/james/mime4j/field/address/AddressTest.java

Author: mwiederkehr
Date: Sat Jan 24 14:19:36 2009
New Revision: 737361

URL: http://svn.apache.org/viewvc?rev=737361&view=rev
Log:
MIME4J-107: fixed getDisplayString and getEncodedString for empty groups

Modified:
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/field/address/Group.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/address/AddressTest.java

Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/field/address/Group.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/field/address/Group.java?rev=737361&r1=737360&r2=737361&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/field/address/Group.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/field/address/Group.java Sat Jan 24 14:19:36 2009
@@ -67,10 +67,13 @@
     public String getDisplayString(boolean includeRoute) {
         StringBuilder sb = new StringBuilder();
 
+        sb.append(name);
+        sb.append(':');
+
+        boolean first = true;
         for (Mailbox mailbox : mailboxList) {
-            if (sb.length() == 0) {
-                sb.append(name);
-                sb.append(':');
+            if (first) {
+                first = false;
             } else {
                 sb.append(',');
             }
@@ -85,21 +88,25 @@
 
     @Override
     public String getEncodedString() {
-        StringBuilder buf = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
+
+        sb.append(EncoderUtil.encodeAddressDisplayName(name));
+        sb.append(':');
 
+        boolean first = true;
         for (Mailbox mailbox : mailboxList) {
-            if (buf.length() == 0) {
-                buf.append(EncoderUtil.encodeAddressDisplayName(name));
-                buf.append(':');
+            if (first) {
+                first = false;
             } else {
-                buf.append(',');
+                sb.append(',');
             }
-            buf.append(mailbox.getEncodedString());
+
+            sb.append(mailbox.getEncodedString());
         }
 
-        buf.append(';');
+        sb.append(';');
 
-        return buf.toString();
+        return sb.toString();
     }
 
     @Override

Modified: james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/address/AddressTest.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/address/AddressTest.java?rev=737361&r1=737360&r2=737361&view=diff
==============================================================================
--- james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/address/AddressTest.java (original)
+++ james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/address/AddressTest.java Sat Jan 24 14:19:36 2009
@@ -397,5 +397,11 @@
                 + ",=?ISO-8859-1?Q?Hans_M=FCller?= <ha...@acme.org>;", g
                 .getEncodedString());
     }
+
+    public void testEmptyGroupGetEncodedString() throws Exception {
+        MailboxList emptyMailboxes = new MailboxList(null, true);
+        Group g = new Group("Undisclosed recipients", emptyMailboxes);
+        assertEquals("Undisclosed recipients:;", g.getEncodedString());
+    }
     
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org