Bug 512052 - Unable to startup Eclipse from debugger every second time
Made BundleTranslationProvider#provider @Optional
Change-Id: I494c46054832ab257bab68ea991d8a01549c6fe2
Signed-off-by: Dirk Fauth <dirk.fauth@googlemail.com>
diff --git a/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/BundleTranslationProvider.java b/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/BundleTranslationProvider.java
index d93f17d..5eaecab 100644
--- a/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/BundleTranslationProvider.java
+++ b/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/BundleTranslationProvider.java
@@ -22,19 +22,21 @@
public class BundleTranslationProvider extends TranslationService {
@Inject
+ @Optional
ResourceBundleProvider provider;
Logger logger;
@Override
public String translate(String key, String contributorURI) {
- if (provider == null) {
+ ResourceBundleProvider prov = this.provider;
+ if (prov == null) {
return key;
}
try {
ResourceBundle resourceBundle = ResourceBundleHelper.getResourceBundleForUri(
- contributorURI, locale, provider);
+ contributorURI, locale, prov);
return getResourceString(key, resourceBundle);
} catch (Exception e) {
// an error occurred on trying to retrieve the translation for the given key
