svn commit: r902420 - /commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationUtils.java

[oheger]

Author: oheger
Date: Sat Jan 23 15:24:59 2010
New Revision: 902420

URL: http://svn.apache.org/viewvc?rev=902420&view=rev
Log:
Replaced deprecated decode() method.

Modified:
    
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationUtils.java

Modified: 
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationUtils.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationUtils.java?rev=902420&r1=902419&r2=902420&view=diff
==============================================================================
--- 
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationUtils.java
 (original)
+++ 
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationUtils.java
 Sat Jan 23 15:24:59 2010
@@ -21,6 +21,7 @@
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
@@ -31,8 +32,8 @@
 import org.apache.commons.configuration.event.ConfigurationErrorEvent;
 import org.apache.commons.configuration.event.ConfigurationErrorListener;
 import org.apache.commons.configuration.event.EventSource;
-import org.apache.commons.configuration.tree.ExpressionEngine;
 import org.apache.commons.configuration.reloading.Reloadable;
+import org.apache.commons.configuration.tree.ExpressionEngine;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.SystemUtils;
 import org.apache.commons.logging.Log;
@@ -62,6 +63,9 @@
     /** Constant for the name of the clone() method.*/
     private static final String METHOD_CLONE = "clone";
 
+    /** Constant for the encoding for URLs. */
+    private static final String ENCODING = "UTF-8";
+
     /** Constant for Java version 1.4.*/
     private static final float JAVA_1_4 = 1.4f;
 
@@ -696,7 +700,15 @@
     {
         if (PROTOCOL_FILE.equals(url.getProtocol()))
         {
-            return new File(URLDecoder.decode(url.getPath()));
+            try
+            {
+                return new File(URLDecoder.decode(url.getPath(), ENCODING));
+            }
+            catch (UnsupportedEncodingException uex)
+            {
+                // should not happen because UTF-8 should be supported
+                throw new AssertionError("Encoding not supported: " + uex);
+            }
         }
         else
         {