Return-Path: X-Original-To: apmail-cocoon-cvs-archive@www.apache.org Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1B7717CB5 for ; Fri, 5 Aug 2011 16:48:59 +0000 (UTC) Received: (qmail 20579 invoked by uid 500); 5 Aug 2011 16:48:58 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 20503 invoked by uid 500); 5 Aug 2011 16:48:58 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 20491 invoked by uid 99); 5 Aug 2011 16:48:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Aug 2011 16:48:58 +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; Fri, 05 Aug 2011 16:48:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9326E238888F for ; Fri, 5 Aug 2011 16:48:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1154308 - /cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/controller/ControllerContextHelper.java Date: Fri, 05 Aug 2011 16:48:37 -0000 To: cvs@cocoon.apache.org From: anathaniel@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110805164837.9326E238888F@eris.apache.org> Author: anathaniel Date: Fri Aug 5 16:48:37 2011 New Revision: 1154308 URL: http://svn.apache.org/viewvc?rev=1154308&view=rev Log: Limit scope of @SuppressWarnings("unchecked") Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/controller/ControllerContextHelper.java Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/controller/ControllerContextHelper.java URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/controller/ControllerContextHelper.java?rev=1154308&r1=1154307&r2=1154308&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/controller/ControllerContextHelper.java (original) +++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/controller/ControllerContextHelper.java Fri Aug 5 16:48:37 2011 @@ -45,19 +45,20 @@ public class ControllerContextHelper { * @return The controller context map as being available in the current * servlet request. */ - @SuppressWarnings("unchecked") public static Map getContext(Map parameters) { HttpServletRequest request = HttpContextHelper.getRequest(parameters); Object controllerContext = request.getAttribute(CONTEXT_OBJECT); if (controllerContext instanceof Map) { - return (Map) controllerContext; + @SuppressWarnings("unchecked") + Map result = (Map) controllerContext; + return result; } if (controllerContext != null) { LOG.warn("The parameters contain an entry with the key " + CONTEXT_OBJECT + " but it is not a map."); } - return Collections.EMPTY_MAP; + return Collections.emptyMap(); } /**