commit 61f10f5822b6c28635bf1ba0237cc084c026ea86
author Sten Roger Sandvik <srs@apache.org> Mon Nov 16 23:46:19 2009 +0000
committer Sten Roger Sandvik <srs@apache.org> Mon Nov 16 23:46:19 2009 +0000
tree fa8cbe73d4a81c91112b926e73076b4ea96e5150
parent 897af46dfcc75d6b3e607e952f3fa08113c45adf

FELIX-1873: Fixed default httpcontext bug in whiteboard

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@881059 13f79535-47bb-0310-9956-ffa450edef68

http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java

diff --git a/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java b/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java
index 2ebe6a2..fb191d1 100644
--- a/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java
+++ b/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java
@@ -98,7 +98,12 @@
     {
         Bundle bundle = ref.getBundle();
         String contextId = getStringProperty(ref, CONTEXT_ID_KEY);
-        return contextId != null ? this.contextManager.getHttpContext(bundle, contextId) : null;
+
+        if (contextId != null) {
+            return this.contextManager.getHttpContext(bundle, contextId);
+        } else {
+            return new DefaultHttpContext(bundle);
+        }
     }
 
     public void add(Filter service, ServiceReference ref)