[commit-cp] [bug #13251] custom-made CharsetProvider cannot be loaded

[Ito Kazumitsu]

Follow-up Comment #2, bug #13251 (project classpath):

This is the patch applied in Kaffe.

ChangeLog:

2005-06-05  Ito Kazumitsu  <address@hidden>

        * java/nio/charset/Charset.java
        (providers2): Allow spaces and comments in
        META-INF/services/java.nio.charset.spi.CharsetProvider.
        Load the provider using the context class loader.

--- java/nio/charset/Charset.java.orig  Wed May 18 06:28:40 2005
+++ java/nio/charset/Charset.java       Sun Jun  5 10:52:25 2005
@@ -267,8 +267,29 @@
                     String s = rdr.readLine();
                     if (s == null)
                      break;
+                   int i = -1, j = -1;
+                   for (int k = 0; k < s.length(); k++)
+                     {
+                       char c = s.charAt(k);
+                       if (c == ' ' || c == '\t')
+                         continue;
+                       if (c == '#')
+                         break;
+                       i = k;
+                       break;
+                     }
+                   if (i < 0)
+                       continue;
+                   for (j = i + 1; j < s.length(); j++)
+                     {
+                       char c = s.charAt(j);
+                       if (c == ' ' || c == '\t' || c == '#')
+                         break;
+                     }
+                   s = s.substring(i, j);
                     CharsetProvider p =
-                     (CharsetProvider) ((Class.forName(s)).newInstance());
+                     (CharsetProvider) ((Class.forName(s, true,
+                        
Thread.currentThread().getContextClassLoader())).newInstance());
                     set.add(p);
                   }
                }



    _______________________________________________________

Reply to this item at:

  <http://savannah.gnu.org/bugs/?func=detailitem&item_id=13251>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/