FELIX-4060 : Implement HTTP Service Update (RFC-189) - minor code cleanup

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1660339 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletContextWrapper.java b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletContextWrapper.java
index 2c1439f..c4f009b 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletContextWrapper.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletContextWrapper.java
@@ -23,7 +23,6 @@
 
 import org.apache.felix.http.base.internal.context.ExtServletContext;
 import org.apache.felix.http.base.internal.context.ExtServletContextWrapper;
-import org.apache.felix.http.base.internal.service.ServletContextImpl;
 
 /**
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/handler/AbstractHandler.java b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/AbstractHandler.java
index 1af303a..ccef7a0 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/handler/AbstractHandler.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/AbstractHandler.java
@@ -25,7 +25,7 @@
 
 import org.apache.felix.http.base.internal.context.ExtServletContext;
 
-public abstract class AbstractHandler<T extends AbstractHandler> implements Comparable<T>
+public abstract class AbstractHandler<T extends AbstractHandler<?>> implements Comparable<T>
 {
     private final String name;
     private final ExtServletContext context;