FELIX-6755 : Create filter directly

Author: cziegeler

http/proxy/src/main/java/org/apache/felix/http/proxy/AbstractProxyServlet.java

@@ -90,7 +90,7 @@ public String getInitParameter(String name) {
                 }
             };
         }
-        this.tracker = new DispatcherTracker(getBundleContext(), null, config);
+        this.tracker = new DispatcherTracker(getBundleContext(), config);
         this.tracker.open();
     }
 

http/proxy/src/main/java/org/apache/felix/http/proxy/impl/DispatcherTracker.java

@@ -21,7 +21,6 @@
 
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
-import org.osgi.framework.Filter;
 import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
 
@@ -33,10 +32,10 @@ public final class DispatcherTracker
     private final ServletConfig config;
     private HttpServlet dispatcher;
 
-    public DispatcherTracker(BundleContext context, String filter, ServletConfig config)
+    public DispatcherTracker(BundleContext context, ServletConfig config)
         throws Exception
     {
-        super(context, createFilter(context, filter), null);
+        super(context, context.createFilter(DEFAULT_FILTER), null);
         this.config = config;
     }
 
@@ -94,14 +93,4 @@ private void initDispatcher()
             log("Failed to initialize dispatcher", e);
         }
     }
-
-    private static Filter createFilter(BundleContext context, String filter)
-        throws Exception
-    {
-        StringBuffer str = new StringBuffer();
-        str.append("(&(").append(Constants.OBJECTCLASS).append("=");
-        str.append(HttpServlet.class.getName()).append(")");
-        str.append(filter != null ? filter : DEFAULT_FILTER).append(")");
-        return context.createFilter(str.toString());
-    }
 }