Author: rickhall
Date: Wed Jul 23 11:48:24 2008
New Revision: 679160
URL: http://svn.apache.org/viewvc?rev=679160&view=rev
Log:
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)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
URL:
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java?rev=679160&r1=679159&r2=679160&view=diff
==============================================================================
---
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
(original)
+++
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
Wed Jul 23 11:48:24 2008
@@ -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()
