diff options
| author | Thomas Watson | 2019-12-19 15:10:57 +0000 |
|---|---|---|
| committer | Thomas Watson | 2019-12-19 15:10:57 +0000 |
| commit | 2e7d2e6b56e4407ce8637b1f1cebf6c94c4c749c (patch) | |
| tree | 3c04cae7f891014d3a7d1963adf862b138e93b94 | |
| parent | 8120812176770c7d296f56185a4df40581454e9d (diff) | |
| download | rt.equinox.framework-2e7d2e6b56e4407ce8637b1f1cebf6c94c4c749c.tar.gz rt.equinox.framework-2e7d2e6b56e4407ce8637b1f1cebf6c94c4c749c.tar.xz rt.equinox.framework-2e7d2e6b56e4407ce8637b1f1cebf6c94c4c749c.zip | |
Bug 552573 - Need to use the original BundleFileWrapperChain
When a ConnectContent does not provide headers then the original
BundleFileWrapperChain should be used to find the bundle manifest.
Change-Id: I1627aa7ecec3caa5f66bc2d001cf3affc726ff2a
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
| -rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleInfo.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleInfo.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleInfo.java index 38ca83f00..5fd5af64a 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleInfo.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleInfo.java @@ -133,12 +133,13 @@ public final class BundleInfo { BundleFile bFile = getBundleFile(); if (this.contentType == Type.CONNECT) { - if (bFile instanceof BundleFileWrapperChain) { - bFile = ((BundleFileWrapperChain) bFile).getWrappedType(ConnectBundleFile.class); - } - rawHeaders = ((ConnectBundleFile) bFile).getConnectHeaders(); - if (rawHeaders != null) { - return rawHeaders; + ConnectBundleFile connectContent = bFile instanceof BundleFileWrapperChain ? // + ((BundleFileWrapperChain) bFile).getWrappedType(ConnectBundleFile.class) : // + (ConnectBundleFile) bFile; + + Map<String, String> connectHeaders = connectContent.getConnectHeaders(); + if (connectHeaders != null) { + return rawHeaders = connectHeaders; } } |