You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/07/21 10:52:22 UTC
svn commit: r1692072 - in
/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal:
service/ServletContextImpl.java service/ServletContextManager.java
whiteboard/SharedServletContextImpl.java whiteboard/WhiteboardManager.java
Author: cziegeler
Date: Tue Jul 21 08:52:22 2015
New Revision: 1692072
URL: http://svn.apache.org/r1692072
Log:
Clean up code
Modified:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java?rev=1692072&r1=1692071&r2=1692072&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java Tue Jul 21 08:52:22 2015
@@ -54,7 +54,6 @@ import org.apache.felix.http.base.intern
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 @@ public class ServletContextImpl implemen
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 @@ public class ServletContextImpl implemen
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 @@ public class ServletContextImpl implemen
final RequestInfo requestInfo = new RequestInfo("", null, null);
dispatcher = new RequestDispatcherImpl(resolution, requestInfo);
}
- else
+ else
{
dispatcher = null;
}
@@ -553,7 +552,7 @@ public class ServletContextImpl implemen
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 @@ public class ServletContextImpl implemen
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)
Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java?rev=1692072&r1=1692071&r2=1692072&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java Tue Jul 21 08:52:22 2015
@@ -25,7 +25,6 @@ import javax.servlet.ServletRequestAttri
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;
Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java?rev=1692072&r1=1692071&r2=1692072&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java Tue Jul 21 08:52:22 2015
@@ -19,7 +19,6 @@ package org.apache.felix.http.base.inter
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 @@ public class SharedServletContextImpl im
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 @@ public class SharedServletContextImpl im
final RequestInfo requestInfo = new RequestInfo("", null, null);
dispatcher = new RequestDispatcherImpl(resolution, requestInfo);
}
- else
+ else
{
dispatcher = null;
}
@@ -354,7 +353,7 @@ public class SharedServletContextImpl im
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 @@ public class SharedServletContextImpl im
final RequestInfo requestInfo = new RequestInfo(pathResolution.servletPath, pathResolution.pathInfo, query);
dispatcher = new RequestDispatcherImpl(resolution, requestInfo);
}
- else
+ else
{
dispatcher = null;
}
Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java?rev=1692072&r1=1692071&r2=1692072&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java Tue Jul 21 08:52:22 2015
@@ -209,7 +209,6 @@ public final class WhiteboardManager
this.serviceRuntime.setServiceReference(null);
- // TODO cleanup
if (this.defaultContextRegistration != null)
{
this.defaultContextRegistration.unregister();