| commit | 661e25bb057d0f9e3b625f96fae3d21874115385 | [log] [tgz] |
|---|---|---|
| author | Richard S. Hall <rickhall@apache.org> | Mon Apr 16 18:50:07 2012 +0000 |
| committer | Richard S. Hall <rickhall@apache.org> | Mon Apr 16 18:50:07 2012 +0000 |
| tree | cb19b05e241d9306a2788c155c49980bd9e42861 | |
| parent | 44435efdc8e6f97bcdb3c8d91bbccc16b2f667c0 [diff] |
Improve handling of "fragment" bundles that are not R4 bundles. (FELIX-3343) git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1326739 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/BundleImpl.java b/framework/src/main/java/org/apache/felix/framework/BundleImpl.java index 6dda703..cc91544 100644 --- a/framework/src/main/java/org/apache/felix/framework/BundleImpl.java +++ b/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
@@ -1082,6 +1082,7 @@ return (thisBundleId < thatBundleId ? -1 : (thisBundleId == thatBundleId ? 0 : 1)); } + @Override public String toString() { String sym = getSymbolicName();
diff --git a/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java b/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java index 2e52ec3..f7a075c 100644 --- a/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java +++ b/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
@@ -225,7 +225,8 @@ public int getTypes() { - if (getHeaders().containsKey(Constants.FRAGMENT_HOST)) + if ((getManifestVersion() == "2") + && getHeaders().containsKey(Constants.FRAGMENT_HOST)) { return BundleRevision.TYPE_FRAGMENT; }
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 20c31ff..027b328 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
@@ -1363,7 +1363,6 @@ s = (s == null) ? (String) headerMap.get(Constants.BUNDLE_NAME) : s; s = (s == null) ? headerMap.toString() : s; logger.log( - owner.getBundle(), Logger.LOG_WARNING, "Only R4 bundles can be fragments: " + s); }