From 02baeab4c44d26cb0147a23e688780a862025496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Herrmann?= Date: Fri, 30 May 2014 13:54:13 +0200 Subject: [PATCH] Enable NLS / TranslationBundle to be used in OSGi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TranslationBundle#load() used to load resource bundles through ResourceBundle#getBundle() without explicitly specifying a class loader. In this case, the class laoder of the calling class (TranslationBundle here) is used. This approach fails in runtime environments like OSGi where there are multiple class loaders. This change enables loading resource bundles in multi class loaders environments. The fix is to pass the class loader of the TranslationBundle-derived class to ResourceBundle#getBundle(). Bug: 436232 Change-Id: I39db61e012dc93ebf388a71bf6088a3310a22bac Signed-off-by: Rüdiger Herrmann --- .../org/eclipse/jgit/nls/TranslationBundle.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/nls/TranslationBundle.java b/org.eclipse.jgit/src/org/eclipse/jgit/nls/TranslationBundle.java index 2c745e1f3..c85c179aa 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/nls/TranslationBundle.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/nls/TranslationBundle.java @@ -99,8 +99,8 @@ * {@link ResourceBundle#getBundle(String, Locale)} method to load a resource * bundle. See the documentation of this method for a detailed explanation of * resource bundle loading strategy. After a bundle is created the - * {@link #effectiveLocale()} method can be used to determine whether the - * bundle really corresponds to the requested locale or is a fallback. + * {@link #effectiveLocale()} method can be used to determine whether the bundle + * really corresponds to the requested locale or is a fallback. * *

* To load a String from a resource bundle property file this class uses the @@ -153,13 +153,17 @@ public ResourceBundle resourceBundle() { * * @param locale * defines the locale to be used when loading the resource bundle - * @exception TranslationBundleLoadingException see {@link TranslationBundleLoadingException} - * @exception TranslationStringMissingException see {@link TranslationStringMissingException} + * @exception TranslationBundleLoadingException + * see {@link TranslationBundleLoadingException} + * @exception TranslationStringMissingException + * see {@link TranslationStringMissingException} */ - void load(Locale locale) throws TranslationBundleLoadingException { + void load(Locale locale) + throws TranslationBundleLoadingException { Class bundleClass = getClass(); try { - resourceBundle = ResourceBundle.getBundle(bundleClass.getName(), locale); + resourceBundle = ResourceBundle.getBundle(bundleClass.getName(), + locale, bundleClass.getClassLoader()); } catch (MissingResourceException e) { throw new TranslationBundleLoadingException(bundleClass, locale, e); }