Modified manifest parser to be more lenient when reading the manifest version;
now it trims() the string after reading it to ignore whitespace. (FELIX-641)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@679160 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
index 082e662..814c322 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
@@ -49,6 +49,7 @@
// Verify that only manifest version 2 is specified.
String manifestVersion = (String) m_headerMap.get(Constants.BUNDLE_MANIFESTVERSION);
+ manifestVersion = (manifestVersion == null) ? null : manifestVersion.trim();
if ((manifestVersion != null) && !manifestVersion.equals("2"))
{
throw new BundleException(
@@ -241,7 +242,7 @@
public String getManifestVersion()
{
String manifestVersion = (String) m_headerMap.get(Constants.BUNDLE_MANIFESTVERSION);
- return (manifestVersion == null) ? "1" : manifestVersion;
+ return (manifestVersion == null) ? "1" : manifestVersion.trim();
}
public String getSymbolicName()