You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2006/01/27 16:19:02 UTC
svn commit: r372872 -
/incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
Author: rickhall
Date: Fri Jan 27 07:18:57 2006
New Revision: 372872
URL: http://svn.apache.org/viewcvs?rev=372872&view=rev
Log:
Fixed an ambiguous method call under JDK 5.
Modified:
incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
Modified: incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java?rev=372872&r1=372871&r2=372872&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java Fri Jan 27 07:18:57 2006
@@ -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
+}