Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3ECE810F04 for ; Mon, 7 Oct 2013 20:18:29 +0000 (UTC) Received: (qmail 42677 invoked by uid 500); 7 Oct 2013 20:18:28 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 42499 invoked by uid 500); 7 Oct 2013 20:18:25 -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 41861 invoked by uid 99); 7 Oct 2013 20:18:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Oct 2013 20:18:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 07 Oct 2013 20:18:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8013023889FD; Mon, 7 Oct 2013 20:18:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1530048 - in /felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context: ExtServletContext.java ServletContextImpl.java Date: Mon, 07 Oct 2013 20:18:02 -0000 To: commits@felix.apache.org From: jawi@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131007201802.8013023889FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jawi Date: Mon Oct 7 20:18:02 2013 New Revision: 1530048 URL: http://svn.apache.org/r1530048 Log: Solved compiler warnings. Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ExtServletContext.java felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ExtServletContext.java URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ExtServletContext.java?rev=1530048&r1=1530047&r2=1530048&view=diff ============================================================================== --- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ExtServletContext.java (original) +++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ExtServletContext.java Mon Oct 7 20:18:02 2013 @@ -16,10 +16,11 @@ */ package org.apache.felix.http.base.internal.context; +import java.io.IOException; + import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; public interface ExtServletContext extends ServletContext Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java?rev=1530048&r1=1530047&r2=1530048&view=diff ============================================================================== --- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java (original) +++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java Mon Oct 7 20:18:02 2013 @@ -105,7 +105,8 @@ public final class ServletContextImpl if (res != null) { try { return res.openStream(); - } catch (IOException e) { + } + catch (IOException e) { // Do nothing } } @@ -207,20 +208,17 @@ public final class ServletContextImpl } } - @SuppressWarnings("deprecation") public Servlet getServlet(String name) throws ServletException { return null; } - @SuppressWarnings("deprecation") public Enumeration getServlets() { return Collections.enumeration(Collections.emptyList()); } - @SuppressWarnings("deprecation") public Enumeration getServletNames() { return Collections.enumeration(Collections.emptyList());