Author: pauls
Date: Wed Mar 5 05:05:52 2008
New Revision: 633838
URL: http://svn.apache.org/viewvc?rev=633838&view=rev
Log:
Use a new method on pd to check for allowed exports.
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
URL:
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java?rev=633838&r1=633837&r2=633838&view=diff
==============================================================================
---
felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
(original)
+++
felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
Wed Mar 5 05:05:52 2008
@@ -31,6 +31,7 @@
import java.util.Map;
import java.util.StringTokenizer;
+import org.apache.felix.framework.BundleProtectionDomain;
import org.apache.felix.framework.Logger;
import org.apache.felix.framework.util.CompoundEnumeration;
import org.apache.felix.framework.util.SecurityManagerEx;
@@ -863,7 +864,7 @@
{
// TODO: RB - Is this permission check correct.
if ((System.getSecurityManager() != null) &&
- !((ProtectionDomain)
modules[modIdx].getContentLoader().getSecurityContext()).implies(
+ !((BundleProtectionDomain)
modules[modIdx].getContentLoader().getSecurityContext()).impliesDirect(
new PackagePermission(pkgName,
PackagePermission.EXPORT)))
{
@@ -898,7 +899,7 @@
// TODO: RB - Is this permission check correct.
if
(inUseCaps[capIdx].getNamespace().equals(ICapability.PACKAGE_NAMESPACE) &&
(System.getSecurityManager() != null) &&
- !((ProtectionDomain)
module.getContentLoader().getSecurityContext()).implies(
+ !((BundleProtectionDomain)
module.getContentLoader().getSecurityContext()).impliesDirect(
new PackagePermission(
(String)
inUseCaps[capIdx].getProperties().get(ICapability.PACKAGE_PROPERTY),
PackagePermission.EXPORT)))
