Re: MissingResourceException with Date under mingw port

[Eric Blake <ebb9@email.byu.edu>]

Adam Megacz wrote:
> 
> Eric Blake <ebb9@email.byu.edu> writes:
> > So why not add this line to Calendar?
> >   private static Class c1 = gnu.java.locale.Calendar.class;
> 
> Sounds good to me.

I propose this patch (should it go on the branch, or just mainline?):

2002-04-10  Eric Blake  <ebb9@email.byu.edu>

	* java/util/Calendar.java (bundleName): Make reference to bundle
	explicit to aid the linker.

Index: java/util/Calendar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/Calendar.java,v
retrieving revision 1.12
diff -u -r1.12 Calendar.java
--- java/util/Calendar.java     22 Jan 2002 22:40:38 -0000      1.12
+++ java/util/Calendar.java     10 Apr 2002 19:49:06 -0000
@@ -1,5 +1,5 @@
 /* java.util.Calendar
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@@ -362,9 +362,12 @@
   static final long serialVersionUID = -1807547505821590642L;

   /**
-   * The name of the resource bundle.
+   * The name of the resource bundle. Since the bundle class is only used by
+   * reflection, we use this expression instead of a string literal so that
+   * the linker will be aware of the dependence.
    */
-  private static final String bundleName = "gnu.java.locale.Calendar";
+  private static final String bundleName
+    = gnu.java.locale.Calendar.class.getName();

   /**
    * Constructs a new Calendar with the default time zone and the default


-- 
This signature intentionally left boring.

Eric Blake             ebb9@email.byu.edu
  BYU student, free software programmer