Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 90169 invoked from network); 21 Sep 2010 08:00:46 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 21 Sep 2010 08:00:46 -0000 Received: (qmail 87858 invoked by uid 500); 21 Sep 2010 08:00:46 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 87769 invoked by uid 500); 21 Sep 2010 08:00:43 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 87757 invoked by uid 99); 21 Sep 2010 08:00:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Sep 2010 08:00:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Sep 2010 08:00:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8193723889EA; Tue, 21 Sep 2010 08:00:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r999263 - /felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceImpl.java Date: Tue, 21 Sep 2010 08:00:22 -0000 To: commits@felix.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100921080022.8193723889EA@eris.apache.org> Author: cziegeler Date: Tue Sep 21 08:00:22 2010 New Revision: 999263 URL: http://svn.apache.org/viewvc?rev=999263&view=rev Log: FELIX-2387 : registerServlet() throws NPE Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceImpl.java Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceImpl.java?rev=999263&r1=999262&r2=999263&view=diff ============================================================================== --- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceImpl.java (original) +++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceImpl.java Tue Sep 21 08:00:22 2010 @@ -16,22 +16,19 @@ */ package org.apache.felix.http.base.internal.service; +import java.util.Dictionary; +import java.util.HashSet; + +import javax.servlet.*; + import org.apache.felix.http.api.ExtHttpService; -import org.apache.felix.http.base.internal.context.ServletContextManager; import org.apache.felix.http.base.internal.context.ExtServletContext; -import org.apache.felix.http.base.internal.handler.HandlerRegistry; -import org.apache.felix.http.base.internal.handler.FilterHandler; -import org.apache.felix.http.base.internal.handler.ServletHandler; +import org.apache.felix.http.base.internal.context.ServletContextManager; +import org.apache.felix.http.base.internal.handler.*; import org.apache.felix.http.base.internal.logger.SystemLogger; +import org.osgi.framework.Bundle; import org.osgi.service.http.HttpContext; import org.osgi.service.http.NamespaceException; -import org.osgi.framework.Bundle; -import javax.servlet.Filter; -import javax.servlet.ServletException; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import java.util.Dictionary; -import java.util.HashSet; public final class HttpServiceImpl implements ExtHttpService @@ -63,6 +60,9 @@ public final class HttpServiceImpl public void registerFilter(Filter filter, String pattern, Dictionary initParams, int ranking, HttpContext context) throws ServletException { + if (filter == null ) { + throw new IllegalArgumentException("Filter must not be null"); + } FilterHandler handler = new FilterHandler(getServletContext(context), filter, pattern, ranking); handler.setInitParams(initParams); this.handlerRegistry.addFilter(handler); @@ -88,10 +88,12 @@ public final class HttpServiceImpl public void registerServlet(String alias, Servlet servlet, Dictionary initParams, HttpContext context) throws ServletException, NamespaceException { + if (servlet == null ) { + throw new IllegalArgumentException("Servlet must not be null"); + } if (!isAliasValid(alias)) { throw new IllegalArgumentException( "Malformed servlet alias [" + alias + "]"); } - ServletHandler handler = new ServletHandler(getServletContext(context), servlet, alias); handler.setInitParams(initParams); this.handlerRegistry.addServlet(handler); @@ -104,7 +106,7 @@ public final class HttpServiceImpl if (!isNameValid(name)) { throw new IllegalArgumentException( "Malformed resource name [" + name + "]"); } - + try { Servlet servlet = new ResourceServlet(name); registerServlet(alias, servlet, null, context);