commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ebo...@apache.org
Subject svn commit: r239611 - in /jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration: ConfigurationUtils.java plist/XMLPropertyListConfiguration.java
Date Wed, 24 Aug 2005 11:38:07 GMT
Author: ebourg
Date: Wed Aug 24 04:38:04 2005
New Revision: 239611

URL: http://svn.apache.org/viewcvs?rev=239611&view=rev
Log:
Fixed compilation errors with the JDK 1.3

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

Modified: jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationUtils.java?rev=239611&r1=239610&r2=239611&view=diff
==============================================================================
--- jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationUtils.java
(original)
+++ jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationUtils.java
Wed Aug 24 04:38:04 2005
@@ -38,9 +38,6 @@
 {
     /** Constant for the file URL protocol.*/
     static final String PROTOCOL_FILE = "file";
-    
-    /** Constant for the URL encoding to be used.*/
-    static final String ENCODING = "UTF-8";
 
     private static Log log = LogFactory.getLog(ConfigurationUtils.class);
 
@@ -486,19 +483,11 @@
     {
         if (PROTOCOL_FILE.equals(url.getProtocol()))
         {
-            try
-            {
-                return new File(URLDecoder.decode(url.getPath(), ENCODING));
-            }
-            catch (UnsupportedEncodingException uex)
-            {
-                // should normally not happen
-                return null;
-            }
+            return new File(URLDecoder.decode(url.getPath()));
         }
         else
         {
             return null;
         }
     }
-}
\ No newline at end of file
+}

Modified: jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java?rev=239611&r1=239610&r2=239611&view=diff
==============================================================================
--- jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java
(original)
+++ jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java
Wed Aug 24 04:38:04 2005
@@ -225,7 +225,7 @@
                 XMLPropertyListConfiguration config = new XMLPropertyListConfiguration();
 
                 // add it to the ArrayNode
-                ArrayNode node = (ArrayNode) digester.peek();
+                ArrayNode node = (ArrayNode) getDigester().peek();
                 node.addValue(config);
 
                 // push the root on the stack



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


Mime
View raw message