svn commit: r1841520 - /aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerState.java

[ro...@apache.org]

Author: rotty3000
Date: Thu Sep 20 22:54:22 2018
New Revision: 1841520

URL: http://svn.apache.org/viewvc?rev=1841520&view=rev
Log:
[cdi] final bundleContext

Signed-off-by: Raymond Auge <ro...@apache.org>

Modified:
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerState.java

Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerState.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerState.java?rev=1841520&r1=1841519&r2=1841520&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerState.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerState.java Thu Sep 20 22:54:22 2018
@@ -86,8 +86,9 @@ public class ContainerState {
 		_bundle = bundle;
 		_extenderBundle = extenderBundle;
 		_ccrLogs = ccrLogs;
+		_bundleContext = bundle.getBundleContext();
 		_log = _ccrLogs.getLogger(getClass());
-		_containerLogs = new Logs.Builder(_bundle.getBundleContext()).build();
+		_containerLogs = new Logs.Builder(_bundleContext).build();
 
 		_changeCount = new ChangeCount();
 		_changeCount.addObserver(ccrChangeCount);
@@ -242,7 +243,7 @@ public class ContainerState {
 	}
 
 	public BundleContext bundleContext() {
-		return _bundle.getBundleContext();
+		return _bundleContext;
 	}
 
 	public ServiceTracker<ConfigurationAdmin, ConfigurationAdmin> caTracker() {
@@ -402,6 +403,7 @@ public class ContainerState {
 	private volatile Deferred<BeanManager> _beanManagerDeferred;
 	private final BeansModel _beansModel;
 	private final Bundle _bundle;
+	private final BundleContext _bundleContext;
 	private final ClassLoader _bundleClassLoader;
 	private final Map<CheckedCallback<?, ?>, Deferred<?>> _callbacks = new ConcurrentHashMap<>();
 	private final ServiceTracker<ConfigurationAdmin, ConfigurationAdmin> _caTracker;