svn commit: r1821217 - in /aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container: BlueprintContainerImpl.java BlueprintDomainCombiner.java BlueprintProtectionDomain.java

[gn...@apache.org]

Author: gnodet
Date: Tue Jan 16 07:11:17 2018
New Revision: 1821217

URL: http://svn.apache.org/viewvc?rev=1821217&view=rev
Log:
[ARIES-1768] BlueprintDomainCombiner should not be holding a reference to BundleContext

Modified:
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintDomainCombiner.java
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintProtectionDomain.java

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java?rev=1821217&r1=1821216&r2=1821217&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java Tue Jan 16 07:11:17 2018
@@ -176,7 +176,7 @@ public class BlueprintContainerImpl
         this.timer = timer;
         this.processors = new ArrayList<Processor>();
         if (System.getSecurityManager() != null) {
-            this.accessControlContext = BlueprintDomainCombiner.createAccessControlContext(bundleContext);
+            this.accessControlContext = BlueprintDomainCombiner.createAccessControlContext(bundle);
         } else {
             this.accessControlContext = null;
         }

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintDomainCombiner.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintDomainCombiner.java?rev=1821217&r1=1821216&r2=1821217&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintDomainCombiner.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintDomainCombiner.java Tue Jan 16 07:11:17 2018
@@ -23,22 +23,23 @@ import java.security.AccessController;
 import java.security.DomainCombiner;
 import java.security.ProtectionDomain;
 
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 
 public class BlueprintDomainCombiner implements DomainCombiner {
-    private final BundleContext bundleContext;
+    private final Bundle bundle;
 
-    public static AccessControlContext createAccessControlContext(BundleContext bundleContext) {
-        return new AccessControlContext(AccessController.getContext(), new BlueprintDomainCombiner(bundleContext));
+    public static AccessControlContext createAccessControlContext(Bundle bundle) {
+        return new AccessControlContext(AccessController.getContext(), new BlueprintDomainCombiner(bundle));
     }
 
-    BlueprintDomainCombiner(BundleContext bundleContext) {
-        this.bundleContext = bundleContext;
+    BlueprintDomainCombiner(Bundle bundle) {
+        this.bundle = bundle;
     }
 
     public ProtectionDomain[] combine(ProtectionDomain[] arg0,
                                       ProtectionDomain[] arg1) {
-        return new ProtectionDomain[] { new BlueprintProtectionDomain(bundleContext) };
+        return new ProtectionDomain[] { new BlueprintProtectionDomain(bundle) };
     }
 
 }

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintProtectionDomain.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintProtectionDomain.java?rev=1821217&r1=1821216&r2=1821217&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintProtectionDomain.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintProtectionDomain.java Tue Jan 16 07:11:17 2018
@@ -21,20 +21,20 @@ package org.apache.aries.blueprint.conta
 import java.security.Permission;
 import java.security.ProtectionDomain;
 
-import org.osgi.framework.BundleContext;
+import org.osgi.framework.Bundle;
 
 public class BlueprintProtectionDomain extends ProtectionDomain {
 
-    private final BundleContext bundleContext;
+    private final Bundle bundle;
 
-    public BlueprintProtectionDomain(BundleContext bundleContext) {
+    public BlueprintProtectionDomain(Bundle bundle) {
         super(null, null);
-        this.bundleContext = bundleContext;
+        this.bundle = bundle;
     }
 
     public boolean implies(Permission permission) {
         try {
-            return bundleContext.getBundle().hasPermission(permission);
+            return bundle.hasPermission(permission);
         } catch (IllegalStateException e) {
             return false;
         }