Fix test failures

git-svn-id: https://svn.apache.org/repos/asf/aries/trunk@1421160 13f79535-47bb-0310-9956-ffa450edef68
apache · Dec 13, 2012 · fe68bf1 · fe68bf1
1 parent 3e11f4a
commit fe68bf1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...print-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java b/...print-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
@@ -159,14 +159,14 @@ public BlueprintContainerImpl(BundleContext bundleContext, Bundle extenderBundle
                                   NamespaceHandlerRegistry handlers, ExecutorService executor, ScheduledExecutorService timer,
                                   List<Object> pathList, ProxyManager proxyManager) {
         this.bundleContext = bundleContext;
-        this.bundle = bundleContext.getBundle();
+        this.bundle = bundleContext != null ? bundleContext.getBundle() : null;
         this.extenderBundle = extenderBundle;
         this.eventDispatcher = eventDispatcher;
         this.handlers = handlers;
         this.pathList = pathList;
         this.converter = new AggregateConverter(this);
         this.componentDefinitionRegistry = new ComponentDefinitionRegistryImpl();
-        this.executors = new ExecutorServiceWrapper(executor);
+        this.executors = executor != null ? new ExecutorServiceWrapper(executor) : null;
         this.timer = timer;
         this.processors = new ArrayList<Processor>();
         if (System.getSecurityManager() != null) {

diff --git a/...print/blueprint-core/src/test/java/org/apache/aries/blueprint/TestBlueprintContainer.java b/...print/blueprint-core/src/test/java/org/apache/aries/blueprint/TestBlueprintContainer.java
@@ -44,7 +44,7 @@ public TestBlueprintContainer(ComponentDefinitionRegistryImpl registry) throws E
     }
 
     public TestBlueprintContainer(ComponentDefinitionRegistryImpl registry, ProxyManager proxyManager) throws Exception {
-        super(new TestBundleContext(), null, null, null, null, null, proxyManager);
+        super(new TestBundleContext(), null, null, null, null, null, null, proxyManager);
         this.registry = registry;
         if (registry != null) {
             registry.registerComponentDefinition(new PassThroughMetadataImpl("blueprintContainer", this));

diff --git a/...int/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BeanRecipeTest.java b/...int/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BeanRecipeTest.java
@@ -120,7 +120,7 @@ public void init() {
 
     @Test
     public void parameterWithGenerics() throws Exception {
-        BlueprintContainerImpl container = new BlueprintContainerImpl(null, null, null, null, null, null, null);
+        BlueprintContainerImpl container = new BlueprintContainerImpl(null, null, null, null, null, null, null, null);
         BeanRecipe recipe = new BeanRecipe("example", container, ExampleService.class, false);
         recipe.setArguments(Arrays.<Object>asList(new ExampleImpl()));
         recipe.setArgTypes(Arrays.<String>asList((String) null));
@@ -195,7 +195,7 @@ public void baseTypeHiding() throws Exception {
 
     @Test
     public void protectedClassAccess() throws Exception {
-        BlueprintContainerImpl container = new BlueprintContainerImpl(null, null, null, null, null, null, null);
+        BlueprintContainerImpl container = new BlueprintContainerImpl(null, null, null, null, null, null, null, null);
         BeanRecipe recipe = new BeanRecipe("a", container, null, false);
         recipe.setFactoryComponent(new PassThroughRecipe("factory", new Factory().create()));
         recipe.setFactoryMethod("getA");