bug 387611: We were comparing a String to a version.

We were using the String representation of a version and comparing it to
the version to see if they were equal. This fixes this by properly
constructing a 'version' object from the string first.

When installing new bundles p2 always immediately updates the bundle
https://bugs.eclipse.org/bugs/show_bug.cgi?id=387611

1 files changed, 17 insertions, 4 deletions

diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java
index 06e259597..dc3ca9693 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java
@@ -195,10 +195,21 @@ class ConfigApplier {
 			if (current == null) {
 				try {
 					current = manipulatingContext.installBundle(bundleLocation);
-					if (!version.equals(current.getVersion()) || !symbolicName.equals(current.getSymbolicName()))
-						// can happen if, for example, the new version of the bundle is installed
-						// to the same bundle location as the old version
-						current.update();
+					if (symbolicName != null && version != null) {
+						Version v;
+						try {
+							v = new Version(version);
+							if (!symbolicName.equals(current.getSymbolicName()) || !v.equals(current.getVersion())) {
+								// can happen if, for example, the new version of the bundle is installed
+								// to the same bundle location as the old version
+								current.update();
+							}
+						} catch (IllegalArgumentException e) {
+							// invalid version string; should log
+							if (Activator.DEBUG)
+								e.printStackTrace();
+						}
+					}
 
 					if (Activator.DEBUG)
 						System.out.println("installed bundle:" + finalList[i]); //$NON-NLS-1$
@@ -307,6 +318,8 @@ class ConfigApplier {
 				continue;
 			if (packageAdminService.getBundleType(bundle) == PackageAdmin.BUNDLE_TYPE_FRAGMENT)
 				continue;
+			if (bundle.getBundleId() == 0)
+				continue;
 
 			try {
 				bundle.start();