diff options
| -rw-r--r-- | libjava/ChangeLog | 10 | ||||
| -rw-r--r-- | libjava/java/util/Calendar.java | 73 |
2 files changed, 66 insertions, 17 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c69302e..5e24920 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,15 @@ 2004-07-09 Bryce McKinlay <mckinlay@redhat.com> + * java.util.Calendar.java (cache): New private static field. Cached + mappings of locales->calendar classes. + (ctorArgTypes): New private static field. Singleton argument for + calendar class constructor lookup. + (getInstance): Cache Locale->Calendar class mappings using HashMap. + Optimize by bypassing reflection instantiation for the + GregorianCalendar case. + +2004-07-09 Bryce McKinlay <mckinlay@redhat.com> + * java/util/Calendar.java: Use getSystemClassLoader as argument for ResourceBundle.getBundle() calls. * java/util/GregorianCalendar.java: Likewise. diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java index e1ecf3e..b7ffb33 100644 --- a/libjava/java/util/Calendar.java +++ b/libjava/java/util/Calendar.java @@ -437,6 +437,16 @@ public abstract class Calendar implements Serializable, Cloneable return getInstance(TimeZone.getDefault(), locale); } + /** + * Cache of locale->calendar-class mappings. This avoids having to do a ResourceBundle + * lookup for every getInstance call. + */ + private static HashMap cache = new HashMap(); + + /** Preset argument types for calendar-class constructor lookup. */ + private static Class[] ctorArgTypes + = new Class[] {TimeZone.class, Locale.class}; + /** * Creates a calendar representing the actual time, using the given * time zone and locale. @@ -445,29 +455,58 @@ public abstract class Calendar implements Serializable, Cloneable */ public static synchronized Calendar getInstance(TimeZone zone, Locale locale) { - String calendarClassName = null; - ResourceBundle rb = getBundle(locale); - calendarClassName = rb.getString("calendarClass"); - if (calendarClassName != null) + Class calendarClass = (Class) cache.get(locale); + Throwable exception = null; + + try { - try + if (calendarClass == null) { - Class calendarClass = Class.forName(calendarClassName); - if (Calendar.class.isAssignableFrom(calendarClass)) + ResourceBundle rb = getBundle(locale); + String calendarClassName = rb.getString("calendarClass"); + + if (calendarClassName != null) { - return (Calendar) calendarClass.getConstructor( - new Class[] { TimeZone.class, Locale.class} - ).newInstance(new Object[] {zone, locale} ); + calendarClass = Class.forName(calendarClassName); + if (Calendar.class.isAssignableFrom(calendarClass)) + cache.put(locale, calendarClass); } } - catch (ClassNotFoundException ex) {} - catch (IllegalAccessException ex) {} - catch (NoSuchMethodException ex) {} - catch (InstantiationException ex) {} - catch (InvocationTargetException ex) {} - // XXX should we ignore these errors or throw an exception ? + + // GregorianCalendar is by far the most common case. Optimize by + // avoiding reflection. + if (calendarClass == GregorianCalendar.class) + return new GregorianCalendar(zone, locale); + + if (Calendar.class.isAssignableFrom(calendarClass)) + { + Constructor ctor = calendarClass.getConstructor(ctorArgTypes); + return (Calendar) ctor.newInstance(new Object[] {zone, locale}); + } + } + catch (ClassNotFoundException ex) + { + exception = ex; + } + catch (IllegalAccessException ex) + { + exception = ex; + } + catch (NoSuchMethodException ex) + { + exception = ex; + } + catch (InstantiationException ex) + { + exception = ex; + } + catch (InvocationTargetException ex) + { + exception = ex; } - return new GregorianCalendar(zone, locale); + + throw new RuntimeException("Error instantiating calendar for locale " + + locale, exception); } /** |