svn commit: r928834 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java status.xml

[sy...@apache.org]

Author: sylvain
Date: Mon Mar 29 16:54:40 2010
New Revision: 928834

URL: http://svn.apache.org/viewvc?rev=928834&view=rev
Log:
COCOON-2286: [serializer] fix loading issue when there are spaces in the file path. Thanks to Cedric Damioli

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java?rev=928834&r1=928833&r2=928834&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java Mon Mar 29 16:54:40 2010
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.zip.ZipEntry;
@@ -126,6 +127,9 @@ public final class CharsetFactory {
             String mtch = file.substring(file.indexOf('!'));
             file = file.substring(5, file.indexOf('!'));
             mtch = mtch.substring(2, mtch.lastIndexOf('/') + 1) + "cs_";
+            
+            // COCOON-2286 allow special characters in path (mainly spaces)
+            file = URLDecoder.decode(file, "UTF-8");
     
             ZipFile zip = new ZipFile(file);
             Enumeration enumeration = zip.entries();

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=928834&r1=928833&r2=928834&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Mon Mar 29 16:54:40 2010
@@ -187,6 +187,9 @@
     <action dev="all" type="update">
       Starting with 2.1.12 the minimum required Java version will be 1.4.2.
     </action>
+    <action dev="SW" type="fix" fixes-bug="COCOON-2286" due-to="Cédric Damioli" due-to-email="cedric.damioli@anyware-services.com">
+      Serializer block: charset data won't load if there's a space in the path to the jar file (e.g "C:\Program Files\MyApp\...")
+    </action>
     <action dev="JSJ" type="fix" fixes-bug="COCOON-2257">
       JCR block: Missing modCount attribute in JCR sample content.
     </action>