felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1661150 - /felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletContextHelperTracker.java
Date Fri, 20 Feb 2015 16:17:19 GMT
Author: cziegeler
Date: Fri Feb 20 16:17:18 2015
New Revision: 1661150

URL: http://svn.apache.org/r1661150
Log:
FELIX-4803 : Implement latest changes to ServletContetxHelper handling

Modified:
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletContextHelperTracker.java

Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletContextHelperTracker.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletContextHelperTracker.java?rev=1661150&r1=1661149&r2=1661150&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletContextHelperTracker.java
(original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletContextHelperTracker.java
Fri Feb 20 16:17:18 2015
@@ -24,7 +24,6 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.http.context.ServletContextHelper;
-import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
 import org.osgi.util.tracker.ServiceTracker;
 
 /**
@@ -40,10 +39,8 @@ public final class ServletContextHelperT
     {
         try
         {
-            return btx.createFilter(String.format("(&(objectClass=%s)(%s=*)(%s=*))",
-                    ServletContextHelper.class.getName(),
-                    HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME,
-                    HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH));
+            return btx.createFilter(String.format("(objectClass=%s)",
+                    ServletContextHelper.class.getName()));
         }
         catch ( final InvalidSyntaxException ise)
         {



Mime
View raw message