Return-Path: 
 <commits-return-42454-apmail-myfaces-commits-archive=myfaces.apache.org@myfaces.apache.org>
X-Original-To: apmail-myfaces-commits-archive@www.apache.org
Delivered-To: apmail-myfaces-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 A2D1C9B1B
	for <apmail-myfaces-commits-archive@www.apache.org>;
 Tue, 24 Jan 2012 09:51:52 +0000 (UTC)
Received: (qmail 69997 invoked by uid 500); 24 Jan 2012 09:51:51 -0000
Delivered-To: apmail-myfaces-commits-archive@myfaces.apache.org
Received: (qmail 69855 invoked by uid 500); 24 Jan 2012 09:51:43 -0000
Mailing-List: contact commits-help@myfaces.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@myfaces.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@myfaces.apache.org>
List-Post: <mailto:commits@myfaces.apache.org>
List-Id: <commits.myfaces.apache.org>
Reply-To: "MyFaces Development" <dev@myfaces.apache.org>
Delivered-To: mailing list commits@myfaces.apache.org
Received: (qmail 69796 invoked by uid 99); 24 Jan 2012 09:51:39 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jan 2012 09:51:39 +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; Tue, 24 Jan 2012 09:51:37 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 4EB67238890D
	for <commits@myfaces.apache.org>; Tue, 24 Jan 2012 09:51:17 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1235188 -
 /myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java
Date: Tue, 24 Jan 2012 09:51:17 -0000
To: commits@myfaces.apache.org
From: gpetracek@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120124095117.4EB67238890D@eris.apache.org>

Author: gpetracek
Date: Tue Jan 24 09:51:16 2012
New Revision: 1235188

URL: http://svn.apache.org/viewvc?rev=1235188&view=rev
Log:
EXTCDI-260 detection of different versions of mojarra

Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java?rev=1235188&r1=1235187&r2=1235188&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java Tue Jan 24 09:51:16 2012
@@ -213,7 +213,8 @@ public abstract class JsfUtils
     {
         Set<RequestParameter> result = new HashSet<RequestParameter>();
 
-        if(externalContext == null || externalContext.getRequestParameterValuesMap() == null)
+        if(externalContext == null || //detection of early config for different mojarra versions
+                externalContext.getRequestParameterValuesMap() == null || externalContext.getRequest() == null)
         {
             return result;
         }