Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2010-04-14 16:09:31 -0400
committerThomas Watson2010-04-14 16:09:31 -0400
commitc886713e5e575076aeeae986f3d20b6e0098271b (patch)
tree63ad0296eca2b877be0e16f0b88910ea79442d0f
parente4fd79e4accf47d6085412f456126e5cbe96fdd7 (diff)
downloadrt.equinox.framework-c886713e5e575076aeeae986f3d20b6e0098271b.tar.gz
rt.equinox.framework-c886713e5e575076aeeae986f3d20b6e0098271b.tar.xz
rt.equinox.framework-c886713e5e575076aeeae986f3d20b6e0098271b.zip
Bug 305452 - Kernel release name with a '+' causes Eclipse to fail to start with an "invalid qualifier" error
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
index 06b87ce3f..1d2bdecf1 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
@@ -357,7 +357,12 @@ public class Framework implements EventDispatcher, EventPublisher, Runnable {
} catch (NoSuchElementException e) {
// ignore, use the values parsed so far
}
- value = new Version(major, minor, micro, qualifier).toString();
+ try {
+ value = new Version(major, minor, micro, qualifier).toString();
+ } catch (IllegalArgumentException e) {
+ // must be an invalid qualifier; just ignore it
+ value = new Version(major, minor, micro).toString();
+ }
properties.put(Constants.FRAMEWORK_OS_VERSION, value);
}
}

Back to the top