diff options
| author | Thomas Wolf | 2021-08-05 18:28:00 +0000 |
|---|---|---|
| committer | Thomas Wolf | 2021-08-17 20:19:29 +0000 |
| commit | ec6701683acb52d5922bedca7d4a2a56a1931f1c (patch) | |
| tree | b80b3222635854c6106f5c5e9c4f91fda125e9dd | |
| parent | 5303c925ebbee54be89b8001fe67c6c887933677 (diff) | |
| download | egit-ec6701683acb52d5922bedca7d4a2a56a1931f1c.tar.gz egit-ec6701683acb52d5922bedca7d4a2a56a1931f1c.tar.xz egit-ec6701683acb52d5922bedca7d4a2a56a1931f1c.zip | |
[osgi] TransportConfigurator needs to wait for the workspace
Access to plugin preferences must happen only once the instance
location is defined.
Bug: 575251
Change-Id: Ie96eebefee17780bd5fc128c6b9ac0f45d3f1798
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| -rw-r--r-- | org.eclipse.egit.core/OSGI-INF/org.eclipse.egit.core.TransportConfigurator.xml | 1 | ||||
| -rw-r--r-- | org.eclipse.egit.core/src/org/eclipse/egit/core/TransportConfigurator.java | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/org.eclipse.egit.core/OSGI-INF/org.eclipse.egit.core.TransportConfigurator.xml b/org.eclipse.egit.core/OSGI-INF/org.eclipse.egit.core.TransportConfigurator.xml index 3a36185c6c..63244b675f 100644 --- a/org.eclipse.egit.core/OSGI-INF/org.eclipse.egit.core.TransportConfigurator.xml +++ b/org.eclipse.egit.core/OSGI-INF/org.eclipse.egit.core.TransportConfigurator.xml @@ -2,5 +2,6 @@ <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="shutDown" name="org.eclipse.egit.core.TransportConfigurator"> <reference bind="setPreferencesService" interface="org.eclipse.core.runtime.preferences.IPreferencesService" name="PreferencesService"/> <reference bind="setProxyService" interface="org.eclipse.core.net.proxy.IProxyService" name="ProxyService"/> + <reference bind="setWorkspace" interface="org.eclipse.core.resources.IWorkspace" name="Workspace"/> <implementation class="org.eclipse.egit.core.TransportConfigurator"/> </scr:component>
\ No newline at end of file diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/TransportConfigurator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/TransportConfigurator.java index 0300c88212..9ae388500e 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/TransportConfigurator.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/TransportConfigurator.java @@ -18,6 +18,7 @@ import java.net.ProxySelector; import java.text.MessageFormat; import org.eclipse.core.net.proxy.IProxyService; +import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; import org.eclipse.core.runtime.preferences.IPreferencesService; import org.eclipse.core.runtime.preferences.InstanceScope; @@ -34,7 +35,7 @@ import org.osgi.service.component.annotations.Deactivate; import org.osgi.service.component.annotations.Reference; /** - * An OSGI service for configuring HTTP and SSH transports. + * An OSGi service for configuring HTTP and SSH transports. */ @Component public class TransportConfigurator { @@ -59,6 +60,11 @@ public class TransportConfigurator { this.proxyService = service; } + @Reference + void setWorkspace(@SuppressWarnings("unused") IWorkspace workspace) { + // Needed indirectly by the preferences service + } + @Activate void start() { setupHttp(); |