You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by kg...@apache.org on 2011/12/11 07:16:56 UTC
svn commit: r1212970 - in
/felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src:
main/java/org/apache/felix/httplite/osgi/HttpServiceImpl.java
main/java/org/apache/felix/httplite/server/ResourceHandler.java test/
Author: kgilmer
Date: Sun Dec 11 06:16:56 2011
New Revision: 1212970
URL: http://svn.apache.org/viewvc?rev=1212970&view=rev
Log:
httplite: remove invalid test code from trunk, unfound resources no not put stack traces in log and return 404 to client
Removed:
felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/test/
Modified:
felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/main/java/org/apache/felix/httplite/osgi/HttpServiceImpl.java
felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/main/java/org/apache/felix/httplite/server/ResourceHandler.java
Modified: felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/main/java/org/apache/felix/httplite/osgi/HttpServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/main/java/org/apache/felix/httplite/osgi/HttpServiceImpl.java?rev=1212970&r1=1212969&r2=1212970&view=diff
==============================================================================
--- felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/main/java/org/apache/felix/httplite/osgi/HttpServiceImpl.java (original)
+++ felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/main/java/org/apache/felix/httplite/osgi/HttpServiceImpl.java Sun Dec 11 06:16:56 2011
@@ -286,7 +286,7 @@ public class HttpServiceImpl implements
}
else
{
- return new ResourceHandler(request, response, element);
+ return new ResourceHandler(request, response, element, m_logger);
}
}
Modified: felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/main/java/org/apache/felix/httplite/server/ResourceHandler.java
URL: http://svn.apache.org/viewvc/felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/main/java/org/apache/felix/httplite/server/ResourceHandler.java?rev=1212970&r1=1212969&r2=1212970&view=diff
==============================================================================
--- felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/main/java/org/apache/felix/httplite/server/ResourceHandler.java (original)
+++ felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/main/java/org/apache/felix/httplite/server/ResourceHandler.java Sun Dec 11 06:16:56 2011
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import org.apache.felix.httplite.osgi.Logger;
import org.apache.felix.httplite.osgi.ServiceRegistration;
import org.apache.felix.httplite.osgi.ServiceRegistrationHandler;
import org.apache.felix.httplite.servlet.HttpConstants;
@@ -44,13 +45,14 @@ public class ResourceHandler implements
private final HttpContext m_httpContext;
private final String m_name;
private final String m_alias;
+ private final Logger m_logger;
/**
* @param req HttpRequest
* @param res HttpResponse
* @param resource ServiceRegistration
*/
- public ResourceHandler(final HttpServletRequestImpl req, final HttpServletResponseImpl res, final ServiceRegistration resource)
+ public ResourceHandler(final HttpServletRequestImpl req, final HttpServletResponseImpl res, final ServiceRegistration resource, final Logger logger)
{
if (resource.isServlet())
{
@@ -62,7 +64,8 @@ public class ResourceHandler implements
this.m_response = res;
this.m_httpContext = resource.getContext();
this.m_name = resource.getName();
- this.m_alias = resource.getAlias();
+ this.m_alias = resource.getAlias();
+ this.m_logger = logger;
}
/* (non-Javadoc)
@@ -84,9 +87,12 @@ public class ResourceHandler implements
URL resource = m_httpContext.getResource(resourceName);
+
if (resource == null)
{
- throw new IOException("Unable to find resource: " + resourceName);
+ m_logger.log(Logger.LOG_DEBUG, "Unable to find resource: " + resourceName);
+ m_response.sendError(404);
+ return;
}
InputStream inputStream = resource.openStream();