PR: 25995

Obtained from: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25995
Submitted by:	olegk@apache.org (Oleg Kalnichevski)
Reviewed by:	Gary D. Gregory


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/codec/trunk@130281 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

src/java/org/apache/commons/codec/net/URLCodec.java

@@ -87,18 +87,19 @@
  * @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
  * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
  * @since 1.2
- * @version $Id: URLCodec.java,v 1.12 2004/01/02 07:01:47 ggregory Exp $
+ * @version $Id: URLCodec.java,v 1.13 2004/01/09 19:02:47 ggregory Exp $
  */
-
 public class URLCodec 
         implements BinaryEncoder, BinaryDecoder, 
                    StringEncoder, StringDecoder 
 {
 
+    private final static String US_ASCII = "US-ASCII";
+    
     /**
      * The <code>String</code> encoding used for decoding and encoding.
      */
-    protected String encoding = "US-ASCII";
+    protected String encoding = "UTF-8";
 
     /**
      * BitSet of www-form-url safe characters.
@@ -265,7 +266,7 @@ public String encode(String pString, String encoding)
         if (pString == null) {
             return null;
         }
-        return new String(encode(pString.getBytes(encoding)), this.getEncoding());
+        return new String(encode(pString.getBytes(encoding)), US_ASCII);
     }
 
 
@@ -282,7 +283,7 @@ public String encode(String pString) throws EncoderException {
             return null;
         }
         try {
-            return new String(encode(pString.getBytes()), this.getEncoding());
+            return encode(pString, this.encoding);
         } catch(UnsupportedEncodingException e) {
             throw new EncoderException(e.getMessage());
         }
@@ -307,7 +308,7 @@ public String decode(String pString, String encoding)
         if (pString == null) {
             return null;
         }
-        return new String(decode(pString.getBytes(this.getEncoding())), encoding);
+        return new String(decode(pString.getBytes(US_ASCII)), encoding);
     }
 
 
@@ -324,13 +325,12 @@ public String decode(String pString) throws DecoderException {
             return null;
         }
         try {
-            return new String(decode(pString.getBytes(this.getEncoding())));
+            return decode(pString, this.encoding);
         } catch(UnsupportedEncodingException e) {
             throw new DecoderException(e.getMessage());
         }
     }
 
-
     /**
      * Encodes an object into its URL safe form. Unsafe characters are 
      * escaped.

src/test/org/apache/commons/codec/net/URLCodecTest.java

@@ -67,7 +67,6 @@
  * 
  * @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
  */
-
 public class URLCodecTest extends TestCase {
 
     static final int SWISS_GERMAN_STUFF_UNICODE [] = {
@@ -241,12 +240,12 @@ public void testInvalidEncoding() {
         URLCodec urlcodec = new URLCodec("NONSENSE");
            String plain = "Hello there!";
             try {
-               String encoded = urlcodec.encode(plain);
+               urlcodec.encode(plain);
                 fail( "We set the encoding to a bogus NONSENSE vlaue, this shouldn't have worked.");
             } catch( EncoderException ee ) {
             }
             try {
-               String decoded = urlcodec.decode(plain);
+               urlcodec.decode(plain);
                 fail( "We set the encoding to a bogus NONSENSE vlaue, this shouldn't have worked.");
             } catch( DecoderException ee ) {
             }
@@ -275,4 +274,14 @@ public void testDecodeObjects() throws Exception {
         } catch( DecoderException ee ) {
         }
     }
+
+    public void testDefaultEncoding() throws Exception {
+        String plain = "Hello there!";
+        URLCodec urlcodec = new URLCodec("UnicodeBig");
+        urlcodec.encode(plain); // To work around a weird quirk in Java 1.2.2
+        String encoded1 = urlcodec.encode(plain, "UnicodeBig");
+        String encoded2 = urlcodec.encode(plain);
+        assertEquals(encoded1, encoded2);
+    }
+
 }