commit | c762b69b98f0e0ba9708eb5cf01d98fbcfcf187c | [log] [tgz] |
---|---|---|
author | Richard S. Hall <rickhall@apache.org> | Fri Jan 27 15:18:57 2006 +0000 |
committer | Richard S. Hall <rickhall@apache.org> | Fri Jan 27 15:18:57 2006 +0000 |
tree | 17d37f202669f0a9f2fa6226036f5c5050445bd0 | |
parent | 652570ec11332ee2a56a1a153122efe7717e294a [diff] |
Fixed an ambiguous method call under JDK 5. git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@372872 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java index 3fb58f2..ad2be0d 100644 --- a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java +++ b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -1142,7 +1142,8 @@ return (obj instanceof java.security.Permission) ? java.security.Policy.getPolicy().getPermissions( new java.security.CodeSource( - new java.net.URL(bundle.getInfo().getLocation()), null)) + new java.net.URL(bundle.getInfo().getLocation()), + (java.security.cert.Certificate[]) null)) .implies((java.security.Permission) obj) : false; } @@ -3803,4 +3804,4 @@ m_bundleLock.notifyAll(); } } -} \ No newline at end of file +}