Author: srs
Date: Mon Nov 16 23:46:19 2009
New Revision: 881059

URL: http://svn.apache.org/viewvc?rev=881059&view=rev
Log:
FELIX-1873: Fixed default httpcontext bug in whiteboard

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

Modified: 
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java?rev=881059&r1=881058&r2=881059&view=diff
==============================================================================
--- 
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java
 (original)
+++ 
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/ExtenderManagerImpl.java
 Mon Nov 16 23:46:19 2009
@@ -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)


Reply via email to