SLING-11649 null check while registering bundle resources (#2)
diff --git a/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceProvider.java b/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceProvider.java
index 6e1b87a..b5a838d 100644
--- a/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceProvider.java
+++ b/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceProvider.java
@@ -29,6 +29,7 @@
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
@@ -66,7 +67,14 @@
props.put(ResourceProvider.PROPERTY_ROOT, this.root.getResourceRoot());
props.put(PROP_BUNDLE,bundle.getBundleId());
- serviceRegistration = bundle.getBundleContext().registerService(ResourceProvider.class, this, props);
+ // SLING-11649 - If this bundle is not in the {@link Bundle#STARTING}, {@link Bundle#ACTIVE},
+ // or {@link Bundle#STOPPING} states or this bundle is a fragment bundle, then this
+ // bundle will have a null {@code BundleContext}.
+ BundleContext bundleContext = bundle.getBundleContext();
+ if (bundleContext == null) {
+ throw new IllegalStateException("No BundleContext was found");
+ }
+ serviceRegistration = bundleContext.registerService(ResourceProvider.class, this, props);
return (Long) serviceRegistration.getReference().getProperty(Constants.SERVICE_ID);
}
diff --git a/src/test/java/org/apache/sling/bundleresource/impl/NoBundleContextTest.java b/src/test/java/org/apache/sling/bundleresource/impl/NoBundleContextTest.java
new file mode 100644
index 0000000..e7b0394
--- /dev/null
+++ b/src/test/java/org/apache/sling/bundleresource/impl/NoBundleContextTest.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.bundleresource.impl;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.util.Dictionary;
+
+import org.apache.sling.spi.resource.provider.ResourceProvider;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
+
+/**
+ * SLING-11649 - verify check for null BundleContext while registering bundle resources
+ */
+public class NoBundleContextTest {
+
+ @Test(expected = IllegalStateException.class)
+ public void verifyIllegalStateExceptionWhenNoBundleContextIsAvailable() throws IOException {
+ final Bundle bundle = mock(Bundle.class);
+ when(bundle.getBundleContext()).thenReturn(null);
+ final PathMapping path = new PathMapping("/libs/foo", null, null);
+
+ final BundleResourceProvider provider = new BundleResourceProvider(new BundleResourceCache(bundle), path);
+ provider.registerService();
+ }
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void verifyNoIllegalStateExceptionWhenBundleContextIsAvailable() throws IOException {
+ final Bundle bundle = mock(Bundle.class);
+ final BundleContext bc = mock(BundleContext.class);
+ when(bundle.getBundleContext()).thenReturn(bc);
+ @SuppressWarnings("rawtypes")
+ final ServiceRegistration<ResourceProvider> svcReg = mock(ServiceRegistration.class);
+ @SuppressWarnings("rawtypes")
+ final ServiceReference<ResourceProvider> svcRef = mock(ServiceReference.class);
+ when(svcRef.getProperty(Constants.SERVICE_ID)).thenReturn(123L);
+ when(svcReg.getReference()).thenReturn(svcRef);
+
+ final PathMapping path = new PathMapping("/libs/foo", null, null);
+ final BundleResourceProvider provider = new BundleResourceProvider(new BundleResourceCache(bundle), path);
+ when(bc.registerService(eq(ResourceProvider.class), eq(provider), any(Dictionary.class))).thenReturn(svcReg);
+ assertEquals(123L, provider.registerService());
+ }
+
+}
