Clean up code
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1692072 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
index 464f3cc..d28b01c 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
@@ -54,7 +54,6 @@
import org.apache.felix.http.base.internal.dispatch.RequestInfo;
import org.apache.felix.http.base.internal.handler.ServletHandler;
import org.apache.felix.http.base.internal.logger.SystemLogger;
-import org.apache.felix.http.base.internal.registry.HandlerRegistry;
import org.apache.felix.http.base.internal.registry.PathResolution;
import org.apache.felix.http.base.internal.registry.PerContextHandlerRegistry;
import org.apache.felix.http.base.internal.registry.ServletResolution;
@@ -75,7 +74,7 @@
private final ServletRequestListener servletRequestListener;
private final ServletRequestAttributeListener servletRequestAttributeListener;
private final PerContextHandlerRegistry handlerRegistry;
-
+
public ServletContextImpl(final Bundle bundle,
final ServletContext context,
final HttpContext httpContext,
@@ -512,7 +511,7 @@
final RequestDispatcher dispatcher;
final ServletHandler servletHandler = this.handlerRegistry.resolveServletByName(name);
- if ( servletHandler != null )
+ if ( servletHandler != null )
{
final ServletResolution resolution = new ServletResolution();
resolution.handler = servletHandler;
@@ -521,7 +520,7 @@
final RequestInfo requestInfo = new RequestInfo("", null, null);
dispatcher = new RequestDispatcherImpl(resolution, requestInfo);
}
- else
+ else
{
dispatcher = null;
}
@@ -553,7 +552,7 @@
final RequestDispatcher dispatcher;
final PathResolution pathResolution = this.handlerRegistry.resolve(requestURI);
- if ( pathResolution != null )
+ if ( pathResolution != null )
{
final ServletResolution resolution = new ServletResolution();
resolution.handler = pathResolution.handler;
@@ -561,13 +560,13 @@
final RequestInfo requestInfo = new RequestInfo(pathResolution.servletPath, pathResolution.pathInfo, query);
dispatcher = new RequestDispatcherImpl(resolution, requestInfo);
}
- else
+ else
{
dispatcher = null;
}
return dispatcher;
}
-
+
private String normalizePath(String path)
{
if (path == null)
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java
index ecb11b9..97078c8 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java
@@ -25,7 +25,6 @@
import javax.servlet.ServletRequestListener;
import org.apache.felix.http.base.internal.context.ExtServletContext;
-import org.apache.felix.http.base.internal.registry.HandlerRegistry;
import org.apache.felix.http.base.internal.registry.PerContextHandlerRegistry;
import org.osgi.framework.Bundle;
import org.osgi.service.http.HttpContext;
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
index d0340d2..339a1f8 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
@@ -19,7 +19,6 @@
import static org.apache.felix.http.base.internal.util.UriUtils.decodePath;
import static org.apache.felix.http.base.internal.util.UriUtils.removeDotSegments;
-import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.Collections;
@@ -313,7 +312,7 @@
final RequestDispatcher dispatcher;
final ServletHandler servletHandler = this.registry.resolveServletByName(name);
- if ( servletHandler != null )
+ if ( servletHandler != null )
{
final ServletResolution resolution = new ServletResolution();
resolution.handler = servletHandler;
@@ -322,7 +321,7 @@
final RequestInfo requestInfo = new RequestInfo("", null, null);
dispatcher = new RequestDispatcherImpl(resolution, requestInfo);
}
- else
+ else
{
dispatcher = null;
}
@@ -354,7 +353,7 @@
final RequestDispatcher dispatcher;
final PathResolution pathResolution = this.registry.resolve(requestURI);
- if ( pathResolution != null )
+ if ( pathResolution != null )
{
final ServletResolution resolution = new ServletResolution();
resolution.handler = pathResolution.handler;
@@ -362,7 +361,7 @@
final RequestInfo requestInfo = new RequestInfo(pathResolution.servletPath, pathResolution.pathInfo, query);
dispatcher = new RequestDispatcherImpl(resolution, requestInfo);
}
- else
+ else
{
dispatcher = null;
}
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
index 4488fc3..98d64c1 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
@@ -209,7 +209,6 @@
this.serviceRuntime.setServiceReference(null);
- // TODO cleanup
if (this.defaultContextRegistration != null)
{
this.defaultContextRegistration.unregister();