diff options
author | Thomas Watson | 2020-03-10 20:27:00 +0000 |
---|---|---|
committer | Thomas Watson | 2020-03-10 20:27:00 +0000 |
commit | e8778b43b41f312da055747ba3a06acbde9fdfae (patch) | |
tree | 57f704deb1b17d891aad0da0c1c5d4bdf5098dad | |
parent | cee7c1437cc402597ea9120c8631e7594164783a (diff) | |
download | rt.equinox.framework-e8778b43b41f312da055747ba3a06acbde9fdfae.tar.gz rt.equinox.framework-e8778b43b41f312da055747ba3a06acbde9fdfae.tar.xz rt.equinox.framework-e8778b43b41f312da055747ba3a06acbde9fdfae.zip |
Revert "Update OSGi R8 APIs"
This reverts commit cee7c1437cc402597ea9120c8631e7594164783a.
3 files changed, 5 insertions, 17 deletions
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java index a16ea2c25..236ad75d7 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java @@ -983,23 +983,11 @@ public class FrameworkUtil { @SuppressWarnings("unchecked") MapAsDictionary(Map< ? extends K, ? extends V> map) { this.map = (Map<K,V>) requireNonNull(map); - boolean nullKey; - try { - nullKey = map.containsKey(null); - } catch (NullPointerException e) { - nullKey = false; // map does not allow null key - } - if (nullKey) { + if (map.containsKey(null)) { throw new NullPointerException( "a Dictionary cannot contain a null key"); } - boolean nullValue; - try { - nullValue = map.containsValue(null); - } catch (NullPointerException e) { - nullValue = false; // map does not allow null value - } - if (nullValue) { + if (map.containsValue(null)) { throw new NullPointerException( "a Dictionary cannot contain a null value"); } diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/connect/ConnectContent.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/connect/ConnectContent.java index 939194542..44ec66031 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/connect/ConnectContent.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/connect/ConnectContent.java @@ -99,7 +99,7 @@ public interface ConnectContent { * again. This allows for a connect content to reuse or create a new class * loader each time the bundle revision is resolved. * - * @return a class loader for the content. + * @return a class loader for the module. */ Optional<ClassLoader> getClassLoader(); @@ -122,7 +122,7 @@ public interface ConnectContent { void close() throws IOException; /** - * Represents the entry of a connect content + * Represents the entry of a connect module */ public interface ConnectEntry { /** diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/connect/ModuleConnector.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/connect/ModuleConnector.java index 3ac13cb44..3f9a112c5 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/connect/ModuleConnector.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/connect/ModuleConnector.java @@ -62,7 +62,7 @@ public interface ModuleConnector { /** * Connects a bundle location with a {@link ConnectModule}. If an - * {@link Optional#empty() empty} optional is returned then the framework + * {@link Optional#empty() empty} optional is returned the the framework * must handle reading the content of the bundle itself. If a value is * {@link Optional#isPresent() present} in the returned optional then the * <code>ConnectModule</code> {@link Optional#get() value} from the optional |