diff options
| author | Dirk Fauth | 2018-04-12 15:09:08 +0000 |
|---|---|---|
| committer | Dirk Fauth | 2018-04-17 13:47:38 +0000 |
| commit | e66c201f18730ece471fee6d3bb2ac2f0decb9c7 (patch) | |
| tree | 14be4a4e86c80d0d10acbd81505d0d2dcca03212 | |
| parent | be50340cc1f2585e55fc7650402420e2eec532aa (diff) | |
| download | eclipse.platform.runtime-e66c201f18730ece471fee6d3bb2ac2f0decb9c7.tar.gz eclipse.platform.runtime-e66c201f18730ece471fee6d3bb2ac2f0decb9c7.tar.xz eclipse.platform.runtime-e66c201f18730ece471fee6d3bb2ac2f0decb9c7.zip | |
Bug 512052 - Unable to startup Eclipse from debugger every second timeI20180419-2000I20180418-2000
Made BundleTranslationProvider#provider @Optional
Change-Id: I494c46054832ab257bab68ea991d8a01549c6fe2
Signed-off-by: Dirk Fauth <dirk.fauth@googlemail.com>
| -rw-r--r-- | bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/BundleTranslationProvider.java | 6 |
1 files changed, 4 insertions, 2 deletions
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 d93f17d0a..5eaecabca 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 @@ import org.osgi.service.log.LoggerFactory; 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 |