Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2012-10-15 11:26:08 -0400
committerUwe Stieber2012-10-15 11:26:56 -0400
commit701133fdfe7724d3b6bca25d966e916c02c15b4f (patch)
tree0c6fb74392e7818a24c15a549534fae7c6aa3134
parentf02e1e26e092e778de63b181dba8c87f18940bfc (diff)
downloadorg.eclipse.tcf-701133fdfe7724d3b6bca25d966e916c02c15b4f.tar.gz
org.eclipse.tcf-701133fdfe7724d3b6bca25d966e916c02c15b4f.tar.xz
org.eclipse.tcf-701133fdfe7724d3b6bca25d966e916c02c15b4f.zip
Eclipse Integration: Fix Bug 391941 - BundleException while initializing org.eclipse.tcf integration bundle
-rw-r--r--features/org.eclipse.tcf.feature/feature.xml2
-rw-r--r--features/org.eclipse.tcf.sdk.feature/feature.xml2
-rw-r--r--plugins/org.eclipse.tcf.core/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.tcf.core/activator/org/eclipse/tcf/internal/Activator.java6
4 files changed, 8 insertions, 4 deletions
diff --git a/features/org.eclipse.tcf.feature/feature.xml b/features/org.eclipse.tcf.feature/feature.xml
index 12910c633..048c8467d 100644
--- a/features/org.eclipse.tcf.feature/feature.xml
+++ b/features/org.eclipse.tcf.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.tcf.feature"
label="%featureName"
- version="1.0.1.qualifier"
+ version="1.0.2.qualifier"
provider-name="%providerName">
<description url="http://wiki.eclipse.org/TCF">
diff --git a/features/org.eclipse.tcf.sdk.feature/feature.xml b/features/org.eclipse.tcf.sdk.feature/feature.xml
index 244e24444..2c2337b64 100644
--- a/features/org.eclipse.tcf.sdk.feature/feature.xml
+++ b/features/org.eclipse.tcf.sdk.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.tcf.sdk.feature"
label="%featureName"
- version="1.0.1.qualifier"
+ version="1.0.2.qualifier"
provider-name="%featureProvider">
<description url="http://wiki.eclipse.org/TCF">
diff --git a/plugins/org.eclipse.tcf.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.tcf.core/META-INF/MANIFEST.MF
index 42e0cf46b..18ed2d8cf 100644
--- a/plugins/org.eclipse.tcf.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tcf.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.tcf.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.tcf.core/activator/org/eclipse/tcf/internal/Activator.java b/plugins/org.eclipse.tcf.core/activator/org/eclipse/tcf/internal/Activator.java
index e755ef269..15fd703ea 100644
--- a/plugins/org.eclipse.tcf.core/activator/org/eclipse/tcf/internal/Activator.java
+++ b/plugins/org.eclipse.tcf.core/activator/org/eclipse/tcf/internal/Activator.java
@@ -33,7 +33,11 @@ public class Activator implements BundleActivator {
if (bundles != null) {
for (Bundle bundle : bundles) {
if ((bundle.getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
- bundle.start(Bundle.START_TRANSIENT);
+ // Call the start(...) only if in RESOLVED state, otherwise
+ // this can trigger a state change bundle exception
+ if (bundle.getState() == Bundle.RESOLVED) {
+ bundle.start(Bundle.START_TRANSIENT);
+ }
cnt++;
}
}

Back to the top