From 3e6f6384491e7513ded63064424b83724e27ddef Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Fri, 13 Mar 2009 15:48:23 +0000 Subject: [PATCH] Removed the unnecessary last semicolon --- .../org/jboss/netty/handler/codec/http/CookieEncoder.java | 4 ++++ .../jboss/netty/handler/codec/http/CookieEncoderTest.java | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jboss/netty/handler/codec/http/CookieEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/CookieEncoder.java index 61c52a7c51..4cc0748436 100644 --- a/src/main/java/org/jboss/netty/handler/codec/http/CookieEncoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/http/CookieEncoder.java @@ -121,6 +121,8 @@ public class CookieEncoder { } } } + + sb.setLength(sb.length() - 1); return sb.toString(); } @@ -157,6 +159,8 @@ public class CookieEncoder { } } } + + sb.setLength(sb.length() - 1); return sb.toString(); } diff --git a/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java b/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java index 1d59399265..2a5cbe5463 100644 --- a/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java @@ -37,7 +37,7 @@ import org.junit.Test; public class CookieEncoderTest { @Test public void testEncodingSingleCookieV0() { - String result = "myCookie=myValue;expires=XXX;path=/apathsomewhere;domain=.adomainsomewhere;secure;"; + String result = "myCookie=myValue;expires=XXX;path=/apathsomewhere;domain=.adomainsomewhere;secure"; Cookie cookie = new DefaultCookie("myCookie", "myValue"); CookieEncoder encoder = new CookieEncoder(true); encoder.addCookie(cookie); @@ -55,7 +55,7 @@ public class CookieEncoderTest { } @Test public void testEncodingSingleCookieV1() { - String result = "myCookie=myValue;max-age=50;path=/apathsomewhere;domain=.adomainsomewhere;secure;comment=this is a comment;version=1;"; + String result = "myCookie=myValue;max-age=50;path=/apathsomewhere;domain=.adomainsomewhere;secure;comment=this is a comment;version=1"; Cookie cookie = new DefaultCookie("myCookie", "myValue"); CookieEncoder encoder = new CookieEncoder(true); encoder.addCookie(cookie); @@ -70,7 +70,7 @@ public class CookieEncoderTest { } @Test public void testEncodingSingleCookieV2() { - String result = "myCookie=myValue;max-age=50;path=/apathsomewhere;domain=.adomainsomewhere;secure;comment=this is a comment;version=1;commentURL=\"http://aurl.com\";port=\"80,8080\";discard;"; + String result = "myCookie=myValue;max-age=50;path=/apathsomewhere;domain=.adomainsomewhere;secure;comment=this is a comment;version=1;commentURL=\"http://aurl.com\";port=\"80,8080\";discard"; Cookie cookie = new DefaultCookie("myCookie", "myValue"); CookieEncoder encoder = new CookieEncoder(true); encoder.addCookie(cookie); @@ -91,7 +91,7 @@ public class CookieEncoderTest { public void testEncodingMultipleCookies() { String c1 = "myCookie=myValue;max-age=50;path=/apathsomewhere;domain=.adomainsomewhere;secure;comment=this is a comment;version=1;commentURL=\"http://aurl.com\";port=\"80,8080\";discard;"; String c2 = "myCookie2=myValue2;path=/anotherpathsomewhere;domain=.anotherdomainsomewhere;comment=this is another comment;version=1;commentURL=\"http://anotherurl.com\";"; - String c3 = "myCookie3=myValue3;version=1;"; + String c3 = "myCookie3=myValue3;version=1"; CookieEncoder encoder = new CookieEncoder(true); Cookie cookie = new DefaultCookie("myCookie", "myValue"); cookie.setVersion(1);