[weld-commits] Weld SVN: r5469 - core/trunk/impl/src/main/java/org/jboss/weld/jsf.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-01-14 17:53:20 -0500 (Thu, 14 Jan 2010)
New Revision: 5469

Modified:
   core/trunk/impl/src/main/java/org/jboss/weld/jsf/FacesUrlTransformer.java
Log:
oops

Modified: core/trunk/impl/src/main/java/org/jboss/weld/jsf/FacesUrlTransformer.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/jsf/FacesUrlTransformer.java	2010-01-14 16:28:01 UTC (rev 5468)
+++ core/trunk/impl/src/main/java/org/jboss/weld/jsf/FacesUrlTransformer.java	2010-01-14 22:53:20 UTC (rev 5469)
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 package org.jboss.weld.jsf;
-import static org.jboss.weld.jsf.JsfHelper.getConversationId;
+import static org.jboss.weld.jsf.JsfHelper.getServletContext;
+import static org.jboss.weld.servlet.BeanProvider.conversationIdName;
 
 import javax.faces.context.FacesContext;
 
@@ -46,7 +47,7 @@
 
    public FacesUrlTransformer appendConversationIdIfNecessary(String cid)
    {
-      String cidParamName = getConversationId(context);
+      String cidParamName = conversationIdName(getServletContext(context));
       int queryStringIndex = url.indexOf(QUERY_STRING_DELIMITER);
       // if there is no query string or there is a query string but the cid param is absent, then append it
       if (queryStringIndex < 0 || url.indexOf(cidParamName + PARAMETER_ASSIGNMENT_OPERATOR, queryStringIndex) < 0)