diff options
author | Thomas Watson | 2019-09-24 21:33:03 +0000 |
---|---|---|
committer | Thomas Watson | 2019-09-24 21:34:07 +0000 |
commit | 72b7fae86de8abc4fb711bd660588648ca16ba89 (patch) | |
tree | e5467f72da76b5266938b6e0c66f999baf5fb07d | |
parent | 5fa5cc6fa8f81132e88638856732dff645a712fa (diff) | |
download | rt.equinox.framework-72b7fae86de8abc4fb711bd660588648ca16ba89.tar.gz rt.equinox.framework-72b7fae86de8abc4fb711bd660588648ca16ba89.tar.xz rt.equinox.framework-72b7fae86de8abc4fb711bd660588648ca16ba89.zip |
Bug 551431 - NPE when system content is null on a restart from cacheI20190929-1800I20190928-1800I20190928-0515I20190928-0205I20190928-0000I20190927-1800I20190927-1530I20190927-0255I20190927-0225I20190927-0145I20190926-1800I20190926-0625
Change-Id: I8efdec5dc7d60354b655da727763e5a8deb2fbfe
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java index a1a6a5c9c..589b65681 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java @@ -516,9 +516,7 @@ public class Storage { if (systemContent == null) { // only do a version check in this case ModuleRevisionBuilder newBuilder = getBuilder(existing, extraCapabilities, extraExports); - if (!currentRevision.getVersion().equals(newBuilder.getVersion())) { - return true; - } + return !currentRevision.getVersion().equals(newBuilder.getVersion()); } if (existing.isDirectory()) { systemContent = new File(systemContent, "META-INF/MANIFEST.MF"); //$NON-NLS-1$ |