Bug#299125: Diff for NMU

[Micah Anderson]

--veXX9dWIonWZEC6h
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

diff -urN /tmp/orig/sablevm-classlib-1.1.9/debian/changelog /tmp/dfsg/sable=
vm-classlib-1.1.9.dfsg1/debian/changelog
--- /tmp/orig/sablevm-classlib-1.1.9/debian/changelog   2005-03-14 14:44:58=
=2E219271552 -0600
+++ /tmp/dfsg/sablevm-classlib-1.1.9.dfsg1/debian/changelog 2005-03-14 14:5=
3:18.503216832 -0600
@@ -1,3 +1,12 @@
+sablevm-classlib (1.1.9.dfsg1-0.1) unstable; urgency=3Dhigh
+
+  * Non-maintainer upload
+  * Patched upstream source with patch from BTS to solve
+    NullPointerException in MessageFormat.format RC bugs (Closes:
+    #299121, #297665, #299125, #285203)
+
+ -- Micah Anderson <micah@debian.org>  Sun, 13 Mar 2005 00:41:36 -0600
+
 sablevm-classlib (1.1.9-1) unstable; urgency=3Dhigh
=20
   * New upstream release
  =20


Additionally, I patched the upstream source (improperly, I should have
patched to provide a .diff.gz with the changes), the patch I used was
the one in #299121:

diff -ru sablevm-classlib-1.1.9/java/text/DecimalFormatSymbols.java
sablevm-classlib-1.1.9-fixed/java/text/DecimalFormatSymbols.java
--- sablevm-classlib-1.1.9/java/text/DecimalFormatSymbols.java
2005-01-20 10:27:39.000000000 -0500
+++ sablevm-classlib-1.1.9-fixed/java/text/DecimalFormatSymbols.java  =20
2005-03-12 17:11:35.000000000 -0500
@@ -148,7 +148,16 @@
       {
        res =3D null;
       }
-    setCurrency(Currency.getInstance(loc));
+
+    Currency currency =3D Currency.getInstance(loc);
+        // some locales don't have a currency instance, such as "en"
+        // only call setCurrency if if a currency instance exists
+        // to prevent a null pointer exception
+        // stew@vireo.org 2005/03/12
+    if( currency !=3D null )
+    {
+        setCurrency(Currency.getInstance(loc));
+    }
     decimalSeparator =3D safeGetChar (res, "decimalSeparator", '.');
     digit =3D safeGetChar (res, "digit", '#');
     exponential =3D safeGetChar (res, "exponential", 'E');	=20


Micah	=20

--veXX9dWIonWZEC6h
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQFCNfsB9n4qXRzy1ioRAhO6AJ9T++TufKL1RZzwpo18uvi3EtuVxACeLOxn
8U+UVasiOSzHVwoWy8ihKL4=
=4LPT
-----END PGP SIGNATURE-----

--veXX9dWIonWZEC6h--