Re: [cp-patches] Suggested patch: java/text/Collator.java

[Michael Koch]

On Thu, Feb 10, 2005 at 11:11:10AM +0100, Jeroen Frijters wrote:
> Hi,
> 
> I'd like to apply the attached patch to make Collator.getInstance() work
> even if the required resource is missing (as it currently is) and to
> throw an InternalError instead of returning null should the rules fail
> to parse.
> 
> Regards,
> Jeroen

Content-Description: Collator.patch.txt
> Index: java/text/Collator.java
> ===================================================================
> RCS file: /cvsroot/classpath/classpath/java/text/Collator.java,v
> retrieving revision 1.11
> diff -u -r1.11 Collator.java
> --- java/text/Collator.java   15 Jun 2004 22:40:39 -0000      1.11
> +++ java/text/Collator.java   10 Feb 2005 10:08:47 -0000
> @@ -308,7 +308,8 @@
>        }
>      catch (MissingResourceException x)
>        {
> -     return null;
> +     pattern = 
> "<0<1<2<3<4<5<6<7<8<9<A,a<b,B<c,C<d,D<e,E<f,F<g,G<h,H<i,I<j,J<k,K" +
> +             "<l,L<m,M<n,N<o,O<p,P<q,Q<r,R<s,S<t,T<u,U<v,V<w,W<x,X<y,Y<z,Z";
>        }
>      try
>        {
> @@ -316,7 +317,7 @@
>        }
>      catch (ParseException x)
>        {
> -     return null;
> +     throw (InternalError)new InternalError().initCause(x);
>        }
>    }

Thanks, please apply imidiately. This make it at least possible to use
gjdoc with jamvm. I got an OutOfMemoryError now but the collation
thingie is at least worked around.

Thanks for this patch.

This needs to go into kaffe too to fix their internal gjdoc.


Michael